Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3f13810 authored by Suresh Siddha's avatar Suresh Siddha Committed by Ingo Molnar
Browse files

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: default avatarSuresh 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: default avatarIngo Molnar <mingo@elte.hu>
parent c39d77ff

arch/ia64/configs/generic_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -234,4 +234,4 @@ CONFIG_CRYPTO_MD5=y 
# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRC_T10DIF=y

CONFIG_MISC_DEVICES=y

CONFIG_DMAR=y
 
CONFIG_INTEL_IOMMU=y

arch/ia64/dig/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#



obj-y := setup.o

ifeq ($(CONFIG_DMAR), y)

ifeq ($(CONFIG_INTEL_IOMMU), y)

obj-$(CONFIG_IA64_GENERIC) += machvec.o machvec_vtd.o

else

obj-$(CONFIG_IA64_GENERIC) += machvec.o

arch/ia64/include/asm/device.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ struct dev_archdata { 
#ifdef CONFIG_ACPI

	void	*acpi_handle;

#endif

#ifdef CONFIG_DMAR

#ifdef CONFIG_INTEL_IOMMU

	void *iommu; /* hook for IOMMU specific extension */

#endif

};

arch/ia64/include/asm/iommu.h

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


extern void pci_iommu_shutdown(void);

extern void no_iommu_init(void);

#ifdef	CONFIG_DMAR

#ifdef	CONFIG_INTEL_IOMMU

extern int force_iommu, no_iommu;

extern int iommu_pass_through;

extern int iommu_detected;

arch/ia64/include/asm/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) 
	return channel ? isa_irq_to_vector(15) : isa_irq_to_vector(14);

}



#ifdef CONFIG_DMAR

#ifdef CONFIG_INTEL_IOMMU

extern void pci_iommu_alloc(void);

#endif

#endif /* _ASM_IA64_PCI_H */