iommu: Rename the DMAR and INTR_REMAP config options
authorSuresh Siddha <suresh.b.siddha@intel.com>
Wed, 24 Aug 2011 00:05:25 +0000 (17:05 -0700)
committerHiroshi DOYU <hdoyu@nvidia.com>
Mon, 23 Jan 2012 09:11:34 +0000 (11:11 +0200)
commit0f3c560f5b2d74e9bc31e2f0c1b68fd885c185df
tree2634953a1b025ee9a79d9f0f25f1b8104c0d1cd1
parent59338e4c81db662ff60c220ed49a10e325a51d6d
iommu: Rename the DMAR and INTR_REMAP config options

Change the CONFIG_DMAR to CONFIG_INTEL_IOMMU to be consistent
with the other IOMMU options.

Rename the CONFIG_INTR_REMAP to CONFIG_IRQ_REMAP to match the
irq subsystem name.

And define the CONFIG_DMAR_TABLE for the common ACPI DMAR
routines shared by both CONFIG_INTEL_IOMMU and CONFIG_IRQ_REMAP.

Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: yinghai@kernel.org
Cc: youquan.song@intel.com
Cc: joerg.roedel@amd.com
Cc: tony.luck@intel.com
Cc: dwmw2@infradead.org
Link: http://lkml.kernel.org/r/20110824001456.558630224@sbsiddha-desk.sc.intel.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Conflicts:

arch/x86/include/asm/irq_remapping.h
arch/x86/kernel/apic/io_apic.c
drivers/iommu/Makefile

Change-Id: I3f09baf327e59d94f38801d107268f4e20c1da8e
24 files changed:
arch/ia64/configs/generic_defconfig
arch/ia64/dig/Makefile
arch/ia64/include/asm/device.h
arch/ia64/include/asm/iommu.h
arch/ia64/include/asm/pci.h
arch/ia64/kernel/Makefile
arch/ia64/kernel/acpi.c
arch/ia64/kernel/msi_ia64.c
arch/ia64/kernel/pci-dma.c
arch/x86/Kconfig
arch/x86/configs/x86_64_defconfig
arch/x86/include/asm/device.h
arch/x86/include/asm/hw_irq.h
arch/x86/include/asm/irq_remapping.h
arch/x86/kernel/apic/apic.c
arch/x86/kernel/apic/io_apic.c
drivers/char/agp/intel-gtt.c
drivers/iommu/Kconfig
drivers/iommu/Makefile
drivers/iommu/intel-iommu.c
drivers/pci/quirks.c
include/linux/dma_remapping.h
include/linux/dmar.h
include/linux/intel-iommu.h