Commit 00b9b0af authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Avoid warning when CPU hotplug isn't enabled

Commit e9fb7631

 ("cpu-hotplug: introduce cpu_notify(),
__cpu_notify(), cpu_notify_nofail()") also introduced this annoying

  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: default avatarLinus Torvalds <>
parent e2e2400b
......@@ -154,16 +154,13 @@ static int cpu_notify(unsigned long val, void *v)
return __cpu_notify(val, v, -1, NULL);
static void cpu_notify_nofail(unsigned long val, void *v)
int err;
err = cpu_notify(val, v);
BUG_ON(cpu_notify(val, v));
void __ref unregister_cpu_notifier(struct notifier_block *nb)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment