Prev: blkio: Add io_queued and avg_queue_size stats
Next: pci/dmar: remove the noisy print out about unmapping
From: David Woodhouse on 9 Apr 2010 11:40
On Thu, 2010-04-08 at 19:58 +0100, Yinghai Lu wrote:
> INTR_REMAP handle that type, so if that is used, we should not complain that
>
> Signed-off-by: Yinghai Lu <yinghai(a)kernel.org>
> ---
> drivers/pci/dmar.c | 10 +++++++---
> 1 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
> index 33ead97..3bd013f 100644
> --- a/drivers/pci/dmar.c
> +++ b/drivers/pci/dmar.c
> @@ -131,9 +131,13 @@ static int __init dmar_parse_dev_scope(void *start, void *end, int *cnt,
> if (scope->entry_type == ACPI_DMAR_SCOPE_TYPE_ENDPOINT ||
> scope->entry_type == ACPI_DMAR_SCOPE_TYPE_BRIDGE)
> (*cnt)++;
> - else
> - printk(KERN_WARNING PREFIX
> - "Unsupported device scope\n");
> + else {
> +#ifdef CONFIG_INTR_REMAP
> + if (scope->entry_type != ACPI_DMAR_SCOPE_TYPE_IOAPIC)
> +#endif
> + printk(KERN_WARNING PREFIX
> + "Unsupported device scope\n");
> + }
> start += scope->length;
> }
> if (*cnt == 0)

Applied, without the ifdef and slightly cleaned up.

--
David Woodhouse Open Source Technology Centre
David.Woodhouse(a)intel.com Intel Corporation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: blkio: Add io_queued and avg_queue_size stats
Next: pci/dmar: remove the noisy print out about unmapping