summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2012-10-19 17:37:35 +0100
committerCatalin Marinas <catalin.marinas@arm.com>2012-12-05 11:26:47 +0000
commitdc637f1fdaa6f335271a0341fef3914b80ab929c (patch)
treeae1297ea49f1a31595476b44516ca1f509bdb7ec /arch
parent9ec218b8f5a22bf909b8c016b2abd75763f94acb (diff)
arm64: move vector entry macro to assembler.h
This macro is also useful to other bits defining vectors (hypervisor stub, KVM...). Move it to a common location. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/include/asm/assembler.h8
-rw-r--r--arch/arm64/kernel/entry.S4
2 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h
index da2a13e8f1e..c8eedc60498 100644
--- a/arch/arm64/include/asm/assembler.h
+++ b/arch/arm64/include/asm/assembler.h
@@ -107,3 +107,11 @@
* Register aliases.
*/
lr .req x30 // link register
+
+/*
+ * Vector entry
+ */
+ .macro ventry label
+ .align 7
+ b \label
+ .endm
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index cbfa4d28100..9c94f404ded 100644
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -148,10 +148,6 @@ tsk .req x28 // current thread_info
/*
* Exception vectors.
*/
- .macro ventry label
- .align 7
- b \label
- .endm
.align 11
ENTRY(vectors)