[PATCH] i386: Update __copy_to_user_inatomic linuxdoc description

[karo-tx-linux.git] / include / asm-i386 / smp.h

diff --git a/include/asm-i386/smp.h b/include/asm-i386/smp.h
index 6bf0033a301cee618101682b53e0677d7ce36ac0..9cab1531c6130dc71c49cbe83651fd47617f8663 100644 (file)
--- a/include/asm-i386/smp.h
+++ b/include/asm-i386/smp.h
@@ -11,16 +11,13 @@
 #include <asm/pda.h>
 #endif
 
-#ifdef CONFIG_X86_LOCAL_APIC
-#ifndef __ASSEMBLY__
-#include <asm/fixmap.h>
+#if defined(CONFIG_X86_LOCAL_APIC) && !defined(__ASSEMBLY__)
 #include <asm/bitops.h>
 #include <asm/mpspec.h>
+#include <asm/apic.h>
 #ifdef CONFIG_X86_IO_APIC
 #include <asm/io_apic.h>
 #endif
-#include <asm/apic.h>
-#endif
 #endif
 
 #define BAD_APICID 0xFFu