X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=mm%2Fslab.c;h=736e497733d60c99ed376ae2bc1b378aea34a0f7;hb=f44200320b10c76003101dee21c5f961e80faf0b;hp=e49f8f46f46d6878dba427dae10fc9b5fb153a9f;hpb=f1bbbb6912662b9f6070c5bfc4ca9eb1f06a9d5b;p=karo-tx-linux.git

diff --git a/mm/slab.c b/mm/slab.c
index e49f8f46f46d..736e497733d6 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -102,7 +102,6 @@
 #include	<linux/cpu.h>
 #include	<linux/sysctl.h>
 #include	<linux/module.h>
-#include	<linux/kmemtrace.h>
 #include	<linux/rcupdate.h>
 #include	<linux/string.h>
 #include	<linux/uaccess.h>
@@ -861,7 +860,7 @@ static void __cpuinit start_cpu_timer(int cpu)
 	 */
 	if (keventd_up() && reap_work->work.func == NULL) {
 		init_reap_node(cpu);
-		INIT_DELAYED_WORK(reap_work, cache_reap);
+		INIT_DELAYED_WORK_DEFERRABLE(reap_work, cache_reap);
 		schedule_delayed_work_on(cpu, reap_work,
 					__round_jiffies_relative(HZ, cpu));
 	}