diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 15:50:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 15:50:59 -0400 |
| commit | 8bd93ca7b03f38a7bc1a4ed9e93e8c006e753d5b (patch) | |
| tree | 308bb026df1360d8708d53ebd4421719b470b2fb /arch/x86/include | |
| parent | 7f82f000ed030d1108b4de47d9e2d556092980c6 (diff) | |
| parent | 87c6f40128f92621698f97a62d2ead5184d1dd97 (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, gart: fix gart detection for Fam11h CPUs
x86: 64 bit print out absent pages num too
x86, kdump: fix invalid access on i386 sparsemem
x86: fix APIC_DEBUG with inquire_remote_apic
x86: AMD microcode patch loader author update
x86: microcode patch loader author update
mailmap: add Peter Oruba
x86, bts: improve help text for BTS config
doc/x86: fix doc subdirs
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 */ |