x86: fix APIC_DEBUG with inquire_remote_apic
authorYinghai Lu <yinghai@kernel.org>
Wed, 15 Oct 2008 01:59:17 +0000 (18:59 -0700)
committerIngo Molnar <mingo@elte.hu>
Tue, 28 Oct 2008 15:43:48 +0000 (16:43 +0100)
APIC_DEBUG is always 2.
need to update inquire_remote_apic to check apic_verbosity with
it instead.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/include/asm/es7000/wakecpu.h
arch/x86/include/asm/mach-default/mach_wakecpu.h

index 3ffc5a7..3984934 100644 (file)
@@ -50,10 +50,9 @@ static inline void restore_NMI_vector(unsigned short *high, unsigned short *low)
 {
 }
 
-#if APIC_DEBUG
- #define inquire_remote_apic(apicid) __inquire_remote_apic(apicid)
-#else
- #define inquire_remote_apic(apicid) {}
-#endif
+#define inquire_remote_apic(apicid) do {               \
+               if (apic_verbosity >= APIC_DEBUG)       \
+                       __inquire_remote_apic(apicid);  \
+       } while (0)
 
 #endif /* __ASM_MACH_WAKECPU_H */
index d5c0b82..9d80db9 100644 (file)
@@ -33,10 +33,9 @@ static inline void restore_NMI_vector(unsigned short *high, unsigned short *low)
 {
 }
 
-#if APIC_DEBUG
- #define inquire_remote_apic(apicid) __inquire_remote_apic(apicid)
-#else
- #define inquire_remote_apic(apicid) {}
-#endif
+#define inquire_remote_apic(apicid) do {               \
+               if (apic_verbosity >= APIC_DEBUG)       \
+                       __inquire_remote_apic(apicid);  \
+       } while (0)
 
 #endif /* _ASM_X86_MACH_DEFAULT_MACH_WAKECPU_H */