diff --git a/[refs] b/[refs] index f3102f3c98d8..2155fe127bbf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 04d733bd3588fda8934591fdb0a3d719c5ec8fa0 +refs/heads/master: 177c7715cd94a66d951fcafbacedd278a2d6fcab diff --git a/trunk/arch/x86/kernel/topology.c b/trunk/arch/x86/kernel/topology.c index a40051b71d9b..0fcc95a354f7 100644 --- a/trunk/arch/x86/kernel/topology.c +++ b/trunk/arch/x86/kernel/topology.c @@ -34,7 +34,7 @@ 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