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/common/mcpm_head.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/common/mcpm_head.S')
| -rw-r--r-- | arch/arm/common/mcpm_head.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/common/mcpm_head.S b/arch/arm/common/mcpm_head.S index 49dd5352fe70..e02db4b81a66 100644 --- a/arch/arm/common/mcpm_head.S +++ b/arch/arm/common/mcpm_head.S @@ -15,6 +15,7 @@ #include <linux/linkage.h> #include <asm/mcpm.h> +#include <asm/assembler.h> #include "vlock.h" @@ -47,6 +48,7 @@ ENTRY(mcpm_entry_point) + ARM_BE8(setend be) THUMB( adr r12, BSYM(1f) ) THUMB( bx r12 ) THUMB( .thumb ) |