diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-04 09:28:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-04 09:28:45 -0800 |
| commit | a3aaabd6b402d8b0ede5aa4a040e9fdbbfdf9116 (patch) | |
| tree | feee65cf5a52fb2be7d2dc48a412b0f3a8b93a05 /arch/x86/kernel/topology.c | |
| parent | 98f20fb6a9b1db4ef6ab19e5eb0e41f04d38b4aa (diff) | |
| parent | da54becc7166b5fad70538acea5e93bdd83dd8a6 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
x86: arch_register_cpu() section fix
x86: free_cache_attributes() section fix
x86: add the word 'WARNING' in check_nmi_watchdog() output
x86: revert CONFIG_X86_HT semantics change
Diffstat (limited to 'arch/x86/kernel/topology.c')
| -rw-r--r-- | arch/x86/kernel/topology.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/topology.c b/arch/x86/kernel/topology.c index 8caa0b77746..7e16d675eb8 100644 --- a/arch/x86/kernel/topology.c +++ b/arch/x86/kernel/topology.c @@ -33,7 +33,7 @@ static struct i386_cpu cpu_devices[NR_CPUS]; -int arch_register_cpu(int num) +int __cpuinit arch_register_cpu(int num) { /* * CPU0 cannot be offlined due to several @@ -53,7 +53,8 @@ int arch_register_cpu(int num) } #ifdef CONFIG_HOTPLUG_CPU -void arch_unregister_cpu(int num) { +void arch_unregister_cpu(int num) +{ return unregister_cpu(&cpu_devices[num].cpu); } EXPORT_SYMBOL(arch_register_cpu); |