* [PATCH] x86-64: double definition of force_iommu in include/asm-x86_64/proto.h
@ 2006-03-01 0:45 Jon Mason
0 siblings, 0 replies; only message in thread
From: Jon Mason @ 2006-03-01 0:45 UTC (permalink / raw)
To: ak; +Cc: mulix, linux-kernel
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 <jdmason@us.ibm.com>
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 *);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2006-03-01 0:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-03-01 0:45 [PATCH] x86-64: double definition of force_iommu in include/asm-x86_64/proto.h Jon Mason
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox