no more warnings! [1/3] zap_low_mappings

PATCH New Matthew Dobson 1 participant 1 message Jul 10, 2003

Share & tools

Matthew Dobson

author

2003-07-10 23:36 UTC #0 lore raw

PATCH 1/1 no more warnings! [1/3] zap_low_mappings

acpi_restore_state_mem() in arch/i386/kernel/acpi/sleep.c uses zap_low_mappings() and isn't SMP-specific. zap_low_mappings() is extern'd in include/asm-i386/smp.h, but wrapped in CONFIG_SMP ifdefs. This should be exported for non-CONFIG_SMP as well. This patch does that.

Cheers!

-Matt

include/asm-i386/smp.h +4 -7

diff -Nurp --exclude-from=/home/mcd/.dontdiff linux-2.5.74-vanilla/include/asm-i386/smp.h linux-2.5.74-warnings/include/asm-i386/smp.h
@@ -8,10 +8,8 @@
 #include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/threads.h>
-#endif
 
 #ifdef CONFIG_X86_LOCAL_APIC
-#ifndef __ASSEMBLY__
 #include <asm/fixmap.h>
 #include <asm/bitops.h>
 #include <asm/mpspec.h>

@@ -20,7 +18,9 @@
 #endif
 #include <asm/apic.h>
 #endif
-#endif
+
+extern void zap_low_mappings (void);
+#endif /* !__ASSEMBLY__ */
 
 #define BAD_APICID 0xFFu
 #ifdef CONFIG_SMP

@@ -43,7 +43,6 @@ extern void smp_message_irq(int cpl, voi
 extern void smp_send_reschedule(int cpu);
 extern void smp_invalidate_rcv(void);		/* Process an NMI */
 extern void (*mtrr_hook) (void);
-extern void zap_low_mappings (void);
 
 #define MAX_APICID 256

@@ -106,8 +105,6 @@ static __inline int logical_smp_processo
 
 #endif
 #endif /* !__ASSEMBLY__ */
-
 #define NO_PROC_ID		0xFF		/* No processor magic marker */
-
-#endif
+#endif /* CONFIG_SMP */
 #endif