summaryrefslogtreecommitdiff
path: root/include/linux/smpboot.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-10-10 11:30:59 +0200
committerIngo Molnar <mingo@kernel.org>2017-10-10 11:30:59 +0200
commit151aeab77738469ddbf0f9532e2fddd0d231aa2b (patch)
treecb1320931d458aeecd1d504575c62ad554a3417a /include/linux/smpboot.h
parent17de4ee04ca925590df036b112c1db8a778e14bf (diff)
parent024c9d2faebdad3fb43fe49ad68e91a36190f1e2 (diff)
downloadlinux-151aeab77738469ddbf0f9532e2fddd0d231aa2b.tar.gz
linux-151aeab77738469ddbf0f9532e2fddd0d231aa2b.tar.bz2
linux-151aeab77738469ddbf0f9532e2fddd0d231aa2b.zip
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/smpboot.h')
-rw-r--r--include/linux/smpboot.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/smpboot.h b/include/linux/smpboot.h
index 12910cf19869..c149aa7bedf3 100644
--- a/include/linux/smpboot.h
+++ b/include/linux/smpboot.h
@@ -55,7 +55,7 @@ smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
}
void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread);
-int smpboot_update_cpumask_percpu_thread(struct smp_hotplug_thread *plug_thread,
- const struct cpumask *);
+void smpboot_update_cpumask_percpu_thread(struct smp_hotplug_thread *plug_thread,
+ const struct cpumask *);
#endif