Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[linux.git] / arch / arm / kernel / process.c

diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 806d287e3e5383972bf08b9d389fbf8e5e8573d3..81ef686a91ca18dccfbb85cd75b5a2aa6c303ecc 100644 (file)
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -38,6 +38,7 @@
 #include <asm/processor.h>
 #include <asm/thread_notify.h>
 #include <asm/stacktrace.h>
+#include <asm/system_misc.h>
 #include <asm/mach/time.h>
 #include <asm/tls.h>
 
@@ -99,7 +100,7 @@ void soft_restart(unsigned long addr)
        u64 *stack = soft_restart_stack + ARRAY_SIZE(soft_restart_stack);
 
        /* Disable interrupts first */
-       local_irq_disable();
+       raw_local_irq_disable();
        local_fiq_disable();
 
        /* Disable the L2 if we're the last man standing. */