This fixes a double definition of force_iommu, and moves no_iommu to be
with the rest of the IOMMU variables.
Thanks,
Jon
Signed-off-by: Jon Mason <[email protected]>
diff -r 149aa2a22913 include/asm-x86_64/proto.h
--- a/include/asm-x86_64/proto.h Tue Feb 28 22:02:10 2006
+++ b/include/asm-x86_64/proto.h Tue Feb 28 18:40:04 2006
@@ -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 *);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
