diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-09 23:29:57 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-09 23:29:57 -0800 |
commit | 0b6ca82af83a79f3d1001c8a0701ed34ac38126e (patch) | |
tree | def8eb112c513b21e826e370f2f34249e97914eb /arch/x86/kernel/topology.c | |
parent | bfc1de0c40a26c6daa46c297e28138aecb4c5664 (diff) | |
parent | fac84939609a683503947f41eb93e1917d026263 (diff) | |
download | kernel_samsung_smdk4412-0b6ca82af83a79f3d1001c8a0701ed34ac38126e.zip kernel_samsung_smdk4412-0b6ca82af83a79f3d1001c8a0701ed34ac38126e.tar.gz kernel_samsung_smdk4412-0b6ca82af83a79f3d1001c8a0701ed34ac38126e.tar.bz2 |
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: (32 commits)
x86: cpa, strict range check in try_preserve_large_page()
x86: cpa, enable CONFIG_DEBUG_PAGEALLOC on 64-bit
x86: cpa, use page pool
x86: introduce page pool in cpa
x86: DEBUG_PAGEALLOC: enable after mem_init()
brk: help text typo fix
lguest: accept guest _PAGE_PWT page table entries
x86 PM: update stale comments
x86 PM: consolidate suspend and hibernation code
x86 PM: rename 32-bit files in arch/x86/power
x86 PM: move 64-bit hibernation files to arch/x86/power
x86: trivial printk optimizations
x86: fix early_ioremap pagetable ops
x86: construct 32-bit boot time page tables in native format.
x86, core: remove CONFIG_FORCED_INLINING
x86: avoid unused variable warning in mm/init_64.c
x86: fixup more paravirt fallout
brk: document randomize_va_space and CONFIG_COMPAT_BRK (was Re:
x86: fix sparse warnings in acpi/bus.c
x86: fix sparse warning in topology.c
...
Diffstat (limited to 'arch/x86/kernel/topology.c')
-rw-r--r-- | arch/x86/kernel/topology.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/topology.c b/arch/x86/kernel/topology.c index e6757aa..a40051b 100644 --- a/arch/x86/kernel/topology.c +++ b/arch/x86/kernel/topology.c @@ -53,7 +53,7 @@ EXPORT_SYMBOL(arch_register_cpu); void arch_unregister_cpu(int num) { - return unregister_cpu(&per_cpu(cpu_devices, num).cpu); + unregister_cpu(&per_cpu(cpu_devices, num).cpu); } EXPORT_SYMBOL(arch_unregister_cpu); #else |