diff --git a/[refs] b/[refs]
index d551de06be60..16b05813a74f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e241ff0c57cb610301009fe8c3b9da4c6877800
+refs/heads/master: 418df63c2d94f238ac7e1d1d53be35dd6b7a7252
diff --git a/trunk/kernel/slow-work.c b/trunk/kernel/slow-work.c
index cf2bc01186ef..b28d19135f43 100644
--- a/trunk/kernel/slow-work.c
+++ b/trunk/kernel/slow-work.c
@@ -609,14 +609,14 @@ void slow_work_unregister_user(void)
 	if (slow_work_user_count == 0) {
 		printk(KERN_NOTICE "Slow work thread pool: Shutting down\n");
 		slow_work_threads_should_exit = true;
+		del_timer_sync(&slow_work_cull_timer);
+		del_timer_sync(&slow_work_oom_timer);
 		wake_up_all(&slow_work_thread_wq);
 		wait_for_completion(&slow_work_last_thread_exited);
 		printk(KERN_NOTICE "Slow work thread pool:"
 		       " Shut down complete\n");
 	}
 
-	del_timer_sync(&slow_work_cull_timer);
-
 	mutex_unlock(&slow_work_user_lock);
 }
 EXPORT_SYMBOL(slow_work_unregister_user);