diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2008-10-14 21:59:17 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:43:48 -0400 |
| commit | 1281675e9c0d4d42d993697f4daab45ef22d49da (patch) | |
| tree | 3969de1cabda6891585caa1e5dfbc9dae702fa95 /arch/x86/include | |
| parent | 3c52204bb90834bca8e9e78a3628d886ad6d4db5 (diff) | |
x86: fix APIC_DEBUG with inquire_remote_apic
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>
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/es7000/wakecpu.h | 9 | ||||
| -rw-r--r-- | arch/x86/include/asm/mach-default/mach_wakecpu.h | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/arch/x86/include/asm/es7000/wakecpu.h b/arch/x86/include/asm/es7000/wakecpu.h index 3ffc5a7bf667..398493461913 100644 --- a/arch/x86/include/asm/es7000/wakecpu.h +++ b/arch/x86/include/asm/es7000/wakecpu.h | |||
| @@ -50,10 +50,9 @@ static inline void restore_NMI_vector(unsigned short *high, unsigned short *low) | |||
| 50 | { | 50 | { |
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | #if APIC_DEBUG | 53 | #define inquire_remote_apic(apicid) do { \ |
| 54 | #define inquire_remote_apic(apicid) __inquire_remote_apic(apicid) | 54 | if (apic_verbosity >= APIC_DEBUG) \ |
| 55 | #else | 55 | __inquire_remote_apic(apicid); \ |
| 56 | #define inquire_remote_apic(apicid) {} | 56 | } while (0) |
| 57 | #endif | ||
| 58 | 57 | ||
| 59 | #endif /* __ASM_MACH_WAKECPU_H */ | 58 | #endif /* __ASM_MACH_WAKECPU_H */ |
diff --git a/arch/x86/include/asm/mach-default/mach_wakecpu.h b/arch/x86/include/asm/mach-default/mach_wakecpu.h index d5c0b826a4ff..9d80db91e992 100644 --- a/arch/x86/include/asm/mach-default/mach_wakecpu.h +++ b/arch/x86/include/asm/mach-default/mach_wakecpu.h | |||
| @@ -33,10 +33,9 @@ static inline void restore_NMI_vector(unsigned short *high, unsigned short *low) | |||
| 33 | { | 33 | { |
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | #if APIC_DEBUG | 36 | #define inquire_remote_apic(apicid) do { \ |
| 37 | #define inquire_remote_apic(apicid) __inquire_remote_apic(apicid) | 37 | if (apic_verbosity >= APIC_DEBUG) \ |
| 38 | #else | 38 | __inquire_remote_apic(apicid); \ |
| 39 | #define inquire_remote_apic(apicid) {} | 39 | } while (0) |
| 40 | #endif | ||
| 41 | 40 | ||
| 42 | #endif /* _ASM_X86_MACH_DEFAULT_MACH_WAKECPU_H */ | 41 | #endif /* _ASM_X86_MACH_DEFAULT_MACH_WAKECPU_H */ |