diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-17 07:07:48 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-17 07:07:48 -0500 |
commit | 1f3f424a6bee9de4d839be9951f4296333fac014 (patch) | |
tree | 95de90dfdb4a9f64fe470709b82176243537c952 /arch/arm/mm | |
parent | c8cae544bba6aee0f5cb0756dbab1a71d2c68737 (diff) | |
parent | 1bda71282ded6a2e09a2db7c8884542fb46bfd4f (diff) |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'arch/arm/mm')
-rw-r--r-- | arch/arm/mm/fault.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index 2df8d9facf57..22c9530e91e2 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
12 | #include <linux/signal.h> | 12 | #include <linux/signal.h> |
13 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
14 | #include <linux/hardirq.h> | ||
14 | #include <linux/init.h> | 15 | #include <linux/init.h> |
15 | #include <linux/kprobes.h> | 16 | #include <linux/kprobes.h> |
16 | #include <linux/uaccess.h> | 17 | #include <linux/uaccess.h> |