diff --git a/[refs] b/[refs] index 5ab8cf1ec936..458eaadb17c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 721ebe005c3bb9add55b2e462dfc1bcf8efc6b8f +refs/heads/master: d243769d3f83b318813a04a9592bb7cfedc6c280 diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c index 58e5c152a6bb..e080d1d744cc 100644 --- a/trunk/kernel/workqueue.c +++ b/trunk/kernel/workqueue.c @@ -635,7 +635,7 @@ int keventd_up(void) int current_is_keventd(void) { struct cpu_workqueue_struct *cwq; - int cpu = smp_processor_id(); /* preempt-safe: keventd is per-cpu */ + int cpu = raw_smp_processor_id(); /* preempt-safe: keventd is per-cpu */ int ret = 0; BUG_ON(!keventd_wq);