diff --git a/[refs] b/[refs] index b3834f4c0c05..3bd24d37d811 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9fdf9b73d61c87a9c16f101bb8bbe069d13046f5 +refs/heads/master: a5b4e57d7cc07cb28ccf16de0876a4770ae84920 diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c index 942bb750a650..48becaba1c94 100644 --- a/trunk/kernel/workqueue.c +++ b/trunk/kernel/workqueue.c @@ -3807,7 +3807,7 @@ static int __init init_workqueues(void) WORK_CPU_LAST); cpu_notifier(workqueue_cpu_up_callback, CPU_PRI_WORKQUEUE_UP); - cpu_notifier(workqueue_cpu_down_callback, CPU_PRI_WORKQUEUE_DOWN); + hotcpu_notifier(workqueue_cpu_down_callback, CPU_PRI_WORKQUEUE_DOWN); /* initialize gcwqs */ for_each_gcwq_cpu(cpu) {