VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / arch / arm / kernel / entry-header.S

diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
index 0af6f53..ef152e3 100644 (file)
--- a/arch/arm/kernel/entry-header.S
+++ b/arch/arm/kernel/entry-header.S
@@ -99,7 +99,7 @@
        ldr     r1, [sp, #S_PSR]                @ Get calling cpsr
        disable_irq ip                          @ disable IRQs
        ldr     lr, [sp, #S_PC]!                @ Get PC
-       msr     spsr, r1                        @ save in spsr_svc
+       msr     spsr_cxsf, r1                   @ save in spsr_svc
        ldmdb   sp, {r0 - lr}^                  @ Get calling r0 - lr
        mov     r0, r0
        add     sp, sp, #S_FRAME_SIZE - S_PC
@@ -112,7 +112,7 @@
        .macro  fast_restore_user_regs
        ldr     r1, [sp, #S_OFF + S_PSR]        @ get calling cpsr
        ldr     lr, [sp, #S_OFF + S_PC]!        @ get pc
-       msr     spsr, r1                        @ save in spsr_svc
+       msr     spsr_cxsf, r1                   @ save in spsr_svc
        ldmdb   sp, {r1 - lr}^                  @ get calling r1 - lr
        mov     r0, r0
        add     sp, sp, #S_FRAME_SIZE - S_PC
@@ -125,7 +125,7 @@
        .macro  slow_restore_user_regs
        ldr     r1, [sp, #S_PSR]                @ get calling cpsr
        ldr     lr, [sp, #S_PC]!                @ get pc
-       msr     spsr, r1                        @ save in spsr_svc
+       msr     spsr_cxsf, r1                   @ save in spsr_svc
        ldmdb   sp, {r0 - lr}^                  @ get calling r1 - lr
        mov     r0, r0
        add     sp, sp, #S_FRAME_SIZE - S_PC