Merge commit 'v2.6.29-rc4' into sched/core

3 files changed, 3 insertions, 2 deletions

diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 77b047475539..85040cfeb5e5 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -650,6 +650,7 @@ ENTRY(fp_enter)
 no_fp:  mov     pc, lr
 
 __und_usr_unknown:
+        enable_irq
         mov     r0, sp
         adr     lr, ret_from_exception
         b       do_undefinstr
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index 06269ea375c5..49a6ba926c2b 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -136,7 +136,7 @@ ENTRY(mcount)
         ldmia sp!, {r0-r3, pc}
 
 trace:
-        ldr r1, [fp, #-4]
+        ldr r1, [fp, #-4]                       @ lr of instrumented routine
         mov r0, lr
         sub r0, r0, #MCOUNT_INSN_SIZE
         mov lr, pc
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index 7141cee1fab7..363db186cb93 100644
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@ -101,7 +101,7 @@ unlock:
 /* Handle bad interrupts */
 static struct irq_desc bad_irq_desc = {
         .handle_irq = handle_bad_irq,
-        .lock = SPIN_LOCK_UNLOCKED
+        .lock = __SPIN_LOCK_UNLOCKED(bad_irq_desc.lock),
 };
 
 /*