diff options
| author | Glauber Costa <gcosta@redhat.com> | 2008-04-08 13:20:52 -0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-19 19:19:57 +0200 |
| commit | f9c258de3494a5249a61fe110ece2082e5927468 (patch) | |
| tree | 53b6b8a031a1e99a76a579ab42d471356685fb86 /arch/x86/kernel/pci-dma_64.c | |
| parent | 85c246ee16fe00bf7bf9e7ff09a5d17d9a83cf71 (diff) | |
x86: unify pci-nommu
merge pci-base_32.c and pci-nommu_64.c into pci-nommu.c
Their code were made the same, so now they can be merged.
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/pci-dma_64.c')
| -rw-r--r-- | arch/x86/kernel/pci-dma_64.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/x86/kernel/pci-dma_64.c b/arch/x86/kernel/pci-dma_64.c index e697b865c1a..9ef18bfad2a 100644 --- a/arch/x86/kernel/pci-dma_64.c +++ b/arch/x86/kernel/pci-dma_64.c @@ -27,14 +27,6 @@ EXPORT_SYMBOL(iommu_bio_merge); static int iommu_sac_force __read_mostly = 0; int no_iommu __read_mostly; -#ifdef CONFIG_IOMMU_DEBUG -int panic_on_overflow __read_mostly = 1; -int force_iommu __read_mostly = 1; -#else -int panic_on_overflow __read_mostly = 0; -int force_iommu __read_mostly= 0; -#endif - /* Set this to 1 if there is a HW IOMMU in the system */ int iommu_detected __read_mostly = 0; |