git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
kprobes.c
diff --git
a/arch/arm/kernel/kprobes.c
b/arch/arm/kernel/kprobes.c
index
610e0f5
..
2ba7deb
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>