diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-28 17:28:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-28 17:28:41 -0800 |
| commit | 707badb80b90d15d97f46155e6af432bd52789a3 (patch) | |
| tree | 56f4aea5043aa4473e67412208b51230e497239a /include | |
| parent | b6a10886442364ceb20115bb3836764a7d99a83b (diff) | |
| parent | c547c77ee4d0408907847f64c403df1bf2f9c7a0 (diff) | |
| download | linux-707badb80b90d15d97f46155e6af432bd52789a3.tar.bz2 | |
Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6:
[PATCH] x86-64: Use stricter in process stack check for unwinder
[PATCH] i386: Fix compilation with UP genericarch
[PATCH] x86-64: Fix warning in io_apic.c
[PATCH] x86-64: work around gcc4 issue with -Os in Dwarf2 stack unwind
[PATCH] x86_64: Align data segment to PAGE_SIZE boundary
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/mach-summit/mach_apic.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-i386/mach-summit/mach_apic.h b/include/asm-i386/mach-summit/mach_apic.h index ef0671e5d5c5..43e5bd8f4a19 100644 --- a/include/asm-i386/mach-summit/mach_apic.h +++ b/include/asm-i386/mach-summit/mach_apic.h @@ -88,7 +88,11 @@ static inline void clustered_apic_check(void) static inline int apicid_to_node(int logical_apicid) { +#ifdef CONFIG_SMP return apicid_2_node[hard_smp_processor_id()]; +#else + return 0; +#endif } /* Mapping from cpu number to logical apicid */ |