diff options
author | James Morse <james.morse@arm.com> | 2015-12-10 05:22:39 -0500 |
---|---|---|
committer | Will Deacon <will.deacon@arm.com> | 2015-12-10 07:08:09 -0500 |
commit | aa4d5d3cbc258c355151a3903211b27359390ec5 (patch) | |
tree | abeb7f9963ff7fc4a867f14009f7a11b74cfae2d /arch/arm64/kernel/entry.S | |
parent | 7596abf2e5661d52c4f414f37addeed54e098880 (diff) |
arm64: Add this_cpu_ptr() assembler macro for use in entry.S
irq_stack is a per_cpu variable, that needs to be access from entry.S.
Use an assembler macro instead of the unreadable details.
Signed-off-by: James Morse <james.morse@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/kernel/entry.S')
-rw-r--r-- | arch/arm64/kernel/entry.S | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index be7ec544b540..e394f8c9595a 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S | |||
@@ -179,9 +179,7 @@ alternative_endif | |||
179 | .macro irq_stack_entry, dummy_lr | 179 | .macro irq_stack_entry, dummy_lr |
180 | mov x19, sp // preserve the original sp | 180 | mov x19, sp // preserve the original sp |
181 | 181 | ||
182 | adr_l x25, irq_stack | 182 | this_cpu_ptr irq_stack, x25, x26 |
183 | mrs x26, tpidr_el1 | ||
184 | add x25, x25, x26 | ||
185 | 183 | ||
186 | /* | 184 | /* |
187 | * Check the lowest address on irq_stack for the irq_count value, | 185 | * Check the lowest address on irq_stack for the irq_count value, |