diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-09 16:31:07 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-09 16:31:07 -0500 |
| commit | af1713e0f111647052953ba12fd10a59c74a5dde (patch) | |
| tree | 4a0cc831c88f888e33a6d9c5ff89f80a8aee42a0 /arch/i386/kernel/smpboot.c | |
| parent | 9b3a89f8b052f2a6193a9691e053f986144a65a0 (diff) | |
| parent | f0f32fccbffaaba8596d5c671153aa37aea9d4f0 (diff) | |
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: no paravirt for X86_VOYAGER or X86_VISWS
[PATCH] i386: Fix io_apic.c warning
[PATCH] i386: export smp_num_siblings for oprofile
[PATCH] x86: Work around gcc 4.2 over aggressive optimizer
[PATCH] x86: Fix boot hang due to nmi watchdog init code
[PATCH] x86: Fix verify_quirk_intel_irqbalance()
[PATCH] i386: Update defconfig
[PATCH] x86-64: Update defconfig
Diffstat (limited to 'arch/i386/kernel/smpboot.c')
| -rw-r--r-- | arch/i386/kernel/smpboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c index 1e00b03163b9..b0f84e5778ad 100644 --- a/arch/i386/kernel/smpboot.c +++ b/arch/i386/kernel/smpboot.c | |||
| @@ -69,7 +69,7 @@ static int __devinitdata smp_b_stepping; | |||
| 69 | 69 | ||
| 70 | /* Number of siblings per CPU package */ | 70 | /* Number of siblings per CPU package */ |
| 71 | int smp_num_siblings = 1; | 71 | int smp_num_siblings = 1; |
| 72 | #ifdef CONFIG_X86_HT | 72 | #ifdef CONFIG_SMP |
| 73 | EXPORT_SYMBOL(smp_num_siblings); | 73 | EXPORT_SYMBOL(smp_num_siblings); |
| 74 | #endif | 74 | #endif |
| 75 | 75 | ||