diff --git a/[refs] b/[refs] index 8de36666c9fe..5cff5ba3b56e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0f9f4a622cec66d09a5d9339f048877c665cec3 +refs/heads/master: acaca3c91536491119e97d428c1da935f411cc9a diff --git a/trunk/arch/arm/kernel/entry-armv.S b/trunk/arch/arm/kernel/entry-armv.S index fc1428905472..414705671865 100644 --- a/trunk/arch/arm/kernel/entry-armv.S +++ b/trunk/arch/arm/kernel/entry-armv.S @@ -545,7 +545,7 @@ vector_\name: @ mrs r13, cpsr bic r13, r13, #MODE_MASK - orr r13, r13, #MODE_SVC + orr r13, r13, #SVC_MODE msr spsr_cxsf, r13 @ switch to SVC_32 mode and lr, lr, #15 diff --git a/trunk/arch/arm/kernel/entry-header.S b/trunk/arch/arm/kernel/entry-header.S index 0eb7fc935e21..5d8a8451629a 100644 --- a/trunk/arch/arm/kernel/entry-header.S +++ b/trunk/arch/arm/kernel/entry-header.S @@ -8,10 +8,6 @@ #include #include -#ifndef MODE_SVC -#define MODE_SVC 0x13 -#endif - .macro zero_fp #ifdef CONFIG_FRAME_POINTER mov fp, #0