aboutsummaryrefslogtreecommitdiff
path: root/kernel/cpu.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-27 10:32:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-27 10:32:08 -0700
commit00b9b0af5887fed54e899e3b7f5c2ccf5e739def (patch)
tree088cd96759cf4c1b2365c0e434dc95a8410b547c /kernel/cpu.c
parente2e2400bd4faee24d11872134b7ae5bd363749c0 (diff)
downloadlinux-2.6.34-ux500-00b9b0af5887fed54e899e3b7f5c2ccf5e739def.tar.gz
Avoid warning when CPU hotplug isn't enabled
Commit e9fb7631ebcd ("cpu-hotplug: introduce cpu_notify(), __cpu_notify(), cpu_notify_nofail()") also introduced this annoying warning: kernel/cpu.c:157: warning: 'cpu_notify_nofail' defined but not used when CONFIG_HOTPLUG_CPU wasn't set. So move that helper inside the #ifdef CONFIG_HOTPLUG_CPU region, and simplify it while at it. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/cpu.c')
-rw-r--r--kernel/cpu.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 63e8de13c94..3097382eb44 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -154,16 +154,13 @@ static int cpu_notify(unsigned long val, void *v)
return __cpu_notify(val, v, -1, NULL);
}
+#ifdef CONFIG_HOTPLUG_CPU
+
static void cpu_notify_nofail(unsigned long val, void *v)
{
- int err;
-
- err = cpu_notify(val, v);
- BUG_ON(err);
+ BUG_ON(cpu_notify(val, v));
}
-#ifdef CONFIG_HOTPLUG_CPU
-
EXPORT_SYMBOL(register_cpu_notifier);
void __ref unregister_cpu_notifier(struct notifier_block *nb)