diff --git a/[refs] b/[refs] index 148decc92d2a..b370643eee39 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d7f18f6ea3a13af95bdf507fc54d42b165e1712 +refs/heads/master: 9e6ec39becb02bda776eebf12c0677910d54b848 diff --git a/trunk/arch/arm/kernel/entry-header.S b/trunk/arch/arm/kernel/entry-header.S index e17e3c30d957..ac34c0d9384b 100644 --- a/trunk/arch/arm/kernel/entry-header.S +++ b/trunk/arch/arm/kernel/entry-header.S @@ -83,6 +83,8 @@ ldr r0, [sp] strex r1, r2, [sp] @ clear the exclusive monitor ldmib sp, {r1 - pc}^ @ load r1 - pc, cpsr +#else + ldmia sp, {r0 - pc}^ @ load r0 - pc, cpsr #endif .endm