Merge branch 'master' into export-slabh

[net-next-2.6.git] / arch / arm / kernel / kprobes.c

diff --git a/arch/arm/kernel/kprobes.c b/arch/arm/kernel/kprobes.c
index 610e0f561c328da554d2f514780ff718b0601b82..2ba7deb3072e5962c6cd3de55d4a2ed2594c1589 100644 (file)
--- a/arch/arm/kernel/kprobes.c
+++ b/arch/arm/kernel/kprobes.c
@@ -22,6 +22,7 @@
 #include <linux/kernel.h>
 #include <linux/kprobes.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/stop_machine.h>
 #include <linux/stringify.h>
 #include <asm/traps.h>