diff --git a/[refs] b/[refs] index 7872007169c7..350c2960917d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 38f51568005873a241a8ae6bf28c9ddd3f6a11ed +refs/heads/master: f6500947a9cbb81cfa07ff344f16955d9c6ebe61 diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c index da6c482944d7..2994a0e3a61c 100644 --- a/trunk/kernel/workqueue.c +++ b/trunk/kernel/workqueue.c @@ -3527,7 +3527,7 @@ static int __init init_workqueues(void) unsigned int cpu; int i; - hotcpu_notifier(workqueue_cpu_callback, CPU_PRI_WORKQUEUE); + cpu_notifier(workqueue_cpu_callback, CPU_PRI_WORKQUEUE); /* initialize gcwqs */ for_each_gcwq_cpu(cpu) {