aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2012-10-19 12:37:35 -0400
committerCatalin Marinas <catalin.marinas@arm.com>2012-12-05 06:26:47 -0500
commitdc637f1fdaa6f335271a0341fef3914b80ab929c (patch)
treeae1297ea49f1a31595476b44516ca1f509bdb7ec
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>
-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 da2a13e8f1e6..c8eedc604984 100644
--- a/arch/arm64/include/asm/assembler.h
+++ b/arch/arm64/include/asm/assembler.h
@@ -107,3 +107,11 @@
107 * Register aliases. 107 * Register aliases.
108 */ 108 */
109lr .req x30 // link register 109lr .req x30 // link register
110
111/*
112 * Vector entry
113 */
114 .macro ventry label
115 .align 7
116 b \label
117 .endm
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index cbfa4d28100e..9c94f404ded6 100644
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -148,10 +148,6 @@ tsk .req x28 // current thread_info
148/* 148/*
149 * Exception vectors. 149 * Exception vectors.
150 */ 150 */
151 .macro ventry label
152 .align 7
153 b \label
154 .endm
155 151
156 .align 11 152 .align 11
157ENTRY(vectors) 153ENTRY(vectors)