Merge branch 'master' into export-slabh
[kernel.git] / arch / x86 / kernel / cpu / perf_event.c
index 53ea4cf..db5bdc8 100644 (file)
@@ -21,6 +21,7 @@
 #include <linux/kdebug.h>
 #include <linux/sched.h>
 #include <linux/uaccess.h>
+#include <linux/slab.h>
 #include <linux/highmem.h>
 #include <linux/cpu.h>
 #include <linux/bitops.h>