Merge remote-tracking branch 'lsk/v3.10/topic/arm64-ptrace' into linux-linaro-lsk

[firefly-linux-kernel-4.4.55.git] / arch / arm / kernel / sleep.S

diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S
index b5c1e636ed8559f22411aa7412d09db526633a18..baf4d28213a59f1cbd94a546526fcb9c7f8d6ed8 100644 (file)
--- a/arch/arm/kernel/sleep.S
+++ b/arch/arm/kernel/sleep.S
@@ -81,6 +81,7 @@ ENDPROC(cpu_resume_after_mmu)
        .data
        .align
 ENTRY(cpu_resume)
+ARM_BE8(setend be)                     @ ensure we are in BE mode
 #ifdef CONFIG_SMP
        mov     r1, #0                  @ fall-back logical index for UP
        ALT_SMP(mrc p15, 0, r0, c0, c0, 5)