diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-12 22:18:38 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-12 22:18:38 +0200 |
| commit | 05c9ca8843cdf688275df891d512e204359717c5 (patch) | |
| tree | 9d9139d62a818ab8d59744fb1211612053d29f98 /arch/arm/mm | |
| parent | Merge branch 'sa1100' into for-next (diff) | |
| parent | ARM: replace BSYM() with badr assembly macro (diff) | |
| download | linux-05c9ca8843cdf688275df891d512e204359717c5.tar.xz linux-05c9ca8843cdf688275df891d512e204359717c5.zip | |
Merge branch 'bsym' into for-next
Conflicts:
arch/arm/kernel/head.S
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/proc-v7m.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-v7m.S b/arch/arm/mm/proc-v7m.S index e08e1f2bab76..67d9209077c6 100644 --- a/arch/arm/mm/proc-v7m.S +++ b/arch/arm/mm/proc-v7m.S @@ -98,7 +98,7 @@ __v7m_setup: str r5, [r0, V7M_SCB_SHPR3] @ set PendSV priority @ SVC to run the kernel in this mode - adr r1, BSYM(1f) + badr r1, 1f ldr r5, [r12, #11 * 4] @ read the SVC vector entry str r1, [r12, #11 * 4] @ write the temporary SVC vector entry mov r6, lr @ save LR |