diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-28 01:43:41 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-30 23:20:26 +0100 |
| commit | 2098990e7c558c175b96213d41058983e00a7919 (patch) | |
| tree | 361449d9c852d07544b16dd0daec5a72541e8bda /arch/arm/kernel/sleep.S | |
| parent | ARM: fix misplaced arch_virt_to_idmap() (diff) | |
| parent | ARM: cci driver need big endian fixes in asm code (diff) | |
| download | linux-2098990e7c558c175b96213d41058983e00a7919.tar.xz linux-2098990e7c558c175b96213d41058983e00a7919.zip | |
Merge branch 'baserock/bjdooks/312-rc4/be/core-v3' of git://git.baserock.org/delta/linux into devel-stable
Conflicts:
arch/arm/kernel/head.S
This series has been well tested and it would be great to get this
merged now.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/sleep.S')
| -rw-r--r-- | arch/arm/kernel/sleep.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S index 622460201911..b907d9b790ab 100644 --- a/arch/arm/kernel/sleep.S +++ b/arch/arm/kernel/sleep.S @@ -126,6 +126,7 @@ ENDPROC(cpu_resume_after_mmu) .data .align ENTRY(cpu_resume) +ARM_BE8(setend be) @ ensure we are in BE mode mov r1, #0 ALT_SMP(mrc p15, 0, r0, c0, c0, 5) ALT_UP_B(1f) |