x86-64: fix double definition of force_iommu
PATCH 1/1 x86-64: fix double definition of force_iommu
From: Jon Mason <[email protected]>
This fixes a double definition of force_iommu, and moves no_iommu to be with the rest of the IOMMU variables.
Signed-off-by Jon Mason <[email protected]>
Signed-off-by Adrian Bunk <[email protected]>
---
This patch was sent by Jon Mason on:
- 28 Feb 2006
include/asm-x86_64/proto.h +1 -1
@@ -109,7 +109,6 @@extern unsigned long table_start, table_end;extern int exception_trace; -extern int force_iommu, no_iommu;extern int using_apic_timer;extern int disable_apic;extern unsigned cpu_khz;
@@ -130,6 +129,7 @@#define iommu_aperture_allowed 0#endif extern int force_iommu; +extern int no_iommu;extern int reboot_force;extern int notsc_setup (char *);