1 files changed, 4 insertions, 0 deletions

diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S
index 5b80b6bdd0c..194ef48968e 100644
--- a/arch/arm/mm/proc-arm926.S
+++ b/arch/arm/mm/proc-arm926.S
@@ -105,9 +105,13 @@ ENTRY(cpu_arm926_do_idle)
         mrc     p15, 0, r1, c1, c0, 0           @ Read control register
         mcr     p15, 0, r0, c7, c10, 4          @ Drain write buffer
         bic     r2, r1, #1 << 12
+        mrs     r3, cpsr                        @ Disable FIQs while Icache
+        orr     ip, r3, #PSR_F_BIT              @ is disabled
+        msr     cpsr_c, ip
         mcr     p15, 0, r2, c1, c0, 0           @ Disable I cache
         mcr     p15, 0, r0, c7, c0, 4           @ Wait for interrupt
         mcr     p15, 0, r1, c1, c0, 0           @ Restore ICache enable
+        msr     cpsr_c, r3                      @ Restore FIQ state
         mov     pc, lr
 
 /*