summaryrefslogtreecommitdiff
path: root/arch/arm/kernel/insn.h
diff options
context:
space:
mode:
authorRabin Vincent <rabin@rab.in>2012-02-18 17:52:41 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-03-24 09:38:56 +0000
commit09f05d8529ff4aa92311c1a55ce35ac98cb59b8c (patch)
tree0196ddc9e80d74c8d3e3473bd7bc21b3e520c3d9 /arch/arm/kernel/insn.h
parenta9468f30b5eac6957c86aea97954553bfb7c1f18 (diff)
ARM: 7334/1: add jump label support
Add the arch-specific code to support jump labels for ARM and Thumb-2. This code will only be activated on compilers that are capable of building it. It has been tested with GCC 4.6 patched with the patch from GCC bug 48637. Cc: Jason Baron <jbaron@redhat.com> Signed-off-by: Rabin Vincent <rabin@rab.in> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/insn.h')
-rw-r--r--arch/arm/kernel/insn.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/kernel/insn.h b/arch/arm/kernel/insn.h
index 994d60fd3ff5..e96065da4dae 100644
--- a/arch/arm/kernel/insn.h
+++ b/arch/arm/kernel/insn.h
@@ -1,6 +1,16 @@
#ifndef __ASM_ARM_INSN_H
#define __ASM_ARM_INSN_H
+static inline unsigned long
+arm_gen_nop(void)
+{
+#ifdef CONFIG_THUMB2_KERNEL
+ return 0xf3af8000; /* nop.w */
+#else
+ return 0xe1a00000; /* mov r0, r0 */
+#endif
+}
+
unsigned long
__arm_gen_branch(unsigned long pc, unsigned long addr, bool link);