diff options
author | Paul Mackerras <paulus@samba.org> | 2008-12-18 11:06:12 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-12-18 11:06:12 +1100 |
commit | c280266a326ccabeb64b6d69fa4fd21faf5bf354 (patch) | |
tree | f8a89e593a0ba43b75bb666d8e245b2460dc0d40 /arch/arm/mm/fault.c | |
parent | eddce368f99b682683e09cf206eaa25131d40abe (diff) | |
parent | 55dac3a5553b13891f0ae4bbd11920619b5436d4 (diff) | |
download | blackbird-op-linux-c280266a326ccabeb64b6d69fa4fd21faf5bf354.tar.gz blackbird-op-linux-c280266a326ccabeb64b6d69fa4fd21faf5bf354.zip |
Merge branch 'linux-2.6' into next
Diffstat (limited to 'arch/arm/mm/fault.c')
-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 @@ #include <linux/module.h> #include <linux/signal.h> #include <linux/mm.h> +#include <linux/hardirq.h> #include <linux/init.h> #include <linux/kprobes.h> #include <linux/uaccess.h> |