From dd8635f7310351aa5489c1fddc1db7a7bb29cb56 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sun, 14 Dec 2008 18:01:44 +0000
Subject: [PATCH] --- yaml --- r: 119895 b: refs/heads/master c:
 67306da610a3e4824192e92888634d3d8700bfc1 h: refs/heads/master i:   119893:
 edc41d9ee23f42041a37009a3dbb30ad0a6a0714   119891:
 455f248c7b1bdf36ca937d1c17b81808cfba3a42   119887:
 73a893322648c0b065bfc9b134c6f85ad9c1c7fd v: v3

---
 [refs]                        | 2 +-
 trunk/arch/arm/kernel/traps.c | 1 +
 trunk/arch/arm/mm/fault.c     | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f86dbdc95b89..c23a6bb68da1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3909845e26439148a484d1ac30bb65e5e0ff63ec
+refs/heads/master: 67306da610a3e4824192e92888634d3d8700bfc1
diff --git a/trunk/arch/arm/kernel/traps.c b/trunk/arch/arm/kernel/traps.c
index 57e6874d0b80..79abc4ddc0cf 100644
--- a/trunk/arch/arm/kernel/traps.c
+++ b/trunk/arch/arm/kernel/traps.c
@@ -18,6 +18,7 @@
 #include <linux/personality.h>
 #include <linux/kallsyms.h>
 #include <linux/delay.h>
+#include <linux/hardirq.h>
 #include <linux/init.h>
 #include <linux/uaccess.h>
 
diff --git a/trunk/arch/arm/mm/fault.c b/trunk/arch/arm/mm/fault.c
index 2df8d9facf57..22c9530e91e2 100644
--- a/trunk/arch/arm/mm/fault.c
+++ b/trunk/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>