From: Andrew Morton <akpm@osdl.org>

In file included from fs/reiser4/reiser4.h:14,
                 from fs/reiser4/debug.h:9,
                 from fs/reiser4/search.c:5:
include/asm/hardirq.h:23:1: warning: "HARDIRQ_BITS" redefined
In file included from include/linux/interrupt.h:11,
                 from include/asm/hw_irq.h:9,
                 from include/linux/irq.h:179,
                 from include/asm/hardirq.h:11,
                 from fs/reiser4/reiser4.h:14,
                 from fs/reiser4/debug.h:9,
                 from fs/reiser4/search.c:5:
include/linux/hardirq.h:29:1: warning: this is the location of the previous definition

Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: "Vladimir V. Saveliev" <vs@namesys.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 fs/reiser4/reiser4.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN fs/reiser4/reiser4.h~reiser4-hardirq-include-fix fs/reiser4/reiser4.h
--- a/fs/reiser4/reiser4.h~reiser4-hardirq-include-fix
+++ a/fs/reiser4/reiser4.h
@@ -10,7 +10,7 @@
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/fs.h>
-#include <asm/hardirq.h>
+#include <linux/hardirq.h>
 #include <linux/sched.h>
 
 /*
_