projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into stackprotector
[cascardo/linux.git]
/
arch
/
x86
/
kernel
/
topology.c
diff --git
a/arch/x86/kernel/topology.c
b/arch/x86/kernel/topology.c
index
e6757aa
..
0fcc95a
100644
(file)
--- a/
arch/x86/kernel/topology.c
+++ b/
arch/x86/kernel/topology.c
@@
-34,7
+34,7
@@
static DEFINE_PER_CPU(struct x86_cpu, cpu_devices);
#ifdef CONFIG_HOTPLUG_CPU
static DEFINE_PER_CPU(struct x86_cpu, cpu_devices);
#ifdef CONFIG_HOTPLUG_CPU
-int arch_register_cpu(int num)
+int
__ref
arch_register_cpu(int num)
{
/*
* CPU0 cannot be offlined due to several
{
/*
* CPU0 cannot be offlined due to several
@@
-53,7
+53,7
@@
EXPORT_SYMBOL(arch_register_cpu);
void arch_unregister_cpu(int num)
{
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
}
EXPORT_SYMBOL(arch_unregister_cpu);
#else