diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-12 23:18:38 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-12 23:18:38 +0300 |
| commit | 05c9ca8843cdf688275df891d512e204359717c5 (patch) | |
| tree | 9d9139d62a818ab8d59744fb1211612053d29f98 /arch/arm/boot/compressed | |
| parent | c62af70ff3015a4412c6655de602fdf7f1ecdaa6 (diff) | |
| parent | 14327c662822e5e874cb971a7162067519300ca8 (diff) | |
| download | linux-05c9ca8843cdf688275df891d512e204359717c5.tar.xz | |
Merge branch 'bsym' into for-next
Conflicts:
arch/arm/kernel/head.S
Diffstat (limited to 'arch/arm/boot/compressed')
| -rw-r--r-- | arch/arm/boot/compressed/head.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 2c45b5709fa4..06e983f59980 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -130,7 +130,7 @@ start: .endr ARM( mov r0, r0 ) ARM( b 1f ) - THUMB( adr r12, BSYM(1f) ) + THUMB( badr r12, 1f ) THUMB( bx r12 ) .word _magic_sig @ Magic numbers to help the loader @@ -447,7 +447,7 @@ dtb_check_done: bl cache_clean_flush - adr r0, BSYM(restart) + badr r0, restart add r0, r0, r6 mov pc, r0 |