From: Andrew Morton <akpm@osdl.org>

In file included from include/asm/bitops.h:23,
                 from include/linux/bitops.h:9,
                 from include/linux/thread_info.h:20,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:49,
                 from include/linux/capability.h:45,
                 from include/linux/sched.h:46,
                 from arch/arm/kernel/asm-offsets.c:13:
include/asm/system.h: In function `adjust_cr':
include/asm/system.h:185: warning: implicit declaration of function `local_irq_save'
include/asm/system.h:192: warning: implicit declaration of function `local_irq_restore'


and

include/asm/system.h:179: warning: unused variable `cr'

Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/asm-arm/system.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff -puN include/asm-arm/system.h~arm-systemh-build-fix include/asm-arm/system.h
--- a/include/asm-arm/system.h~arm-systemh-build-fix
+++ a/include/asm-arm/system.h
@@ -73,6 +73,7 @@
 #ifndef __ASSEMBLY__
 
 #include <linux/linkage.h>
+#include <linux/irqflags.h>
 
 struct thread_info;
 struct task_struct;
@@ -176,7 +177,7 @@ extern unsigned long cr_alignment;	/* de
 #ifndef CONFIG_SMP
 static inline void adjust_cr(unsigned long mask, unsigned long set)
 {
-	unsigned long flags, cr;
+	unsigned long flags;
 
 	mask &= ~CR_A;
 
_