aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/assembler.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-11-14 08:28:30 +0100
committerIngo Molnar <mingo@kernel.org>2013-11-14 08:28:30 +0100
commit555a098af6086256bc64d3806519f37ccae936e0 (patch)
tree4f13126483fc1202d23f1ba55045fac41d19118e /arch/arm/include/asm/assembler.h
parentd969135aae1434547f41853f0e8eaa622e8b8816 (diff)
parentf0d55cc1a65852e6647d4f5d707c1c9b5471ce3c (diff)
Merge branch 'linus' into perf/urgent
Merge dependencies to apply a fix. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/include/asm/assembler.h')
-rw-r--r--arch/arm/include/asm/assembler.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
index fcc1b5bf697..5c228516057 100644
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
@@ -53,6 +53,13 @@
#define put_byte_3 lsl #0
#endif
+/* Select code for any configuration running in BE8 mode */
+#ifdef CONFIG_CPU_ENDIAN_BE8
+#define ARM_BE8(code...) code
+#else
+#define ARM_BE8(code...)
+#endif
+
/*
* Data preload for architectures that support it
*/