diff options
| author | Nicholas Piggin <npiggin@gmail.com> | 2023-04-07 06:09:24 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2023-04-12 02:58:10 +0200 |
| commit | cd99dac6ec5fff763852d8ccb8a79f5de50ed830 (patch) | |
| tree | ec94f1bc24d779ef447c4abb82ef2c9386c8d35a /arch/powerpc/boot/crt0.S | |
| parent | powerpc/32: Include thread_info.h in head_booke.h (diff) | |
| download | linux-cd99dac6ec5fff763852d8ccb8a79f5de50ed830.tar.xz linux-cd99dac6ec5fff763852d8ccb8a79f5de50ed830.zip | |
powerpc/boot: Fix crt0.S current address branch form
Use the preferred form of branch-and-link for finding the current
address so objtool doesn't think it is an unannotated intra-function
call.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230407040924.231023-1-npiggin@gmail.com
Diffstat (limited to 'arch/powerpc/boot/crt0.S')
| -rw-r--r-- | arch/powerpc/boot/crt0.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/crt0.S b/arch/powerpc/boot/crt0.S index 44544720daae..121cab9d579b 100644 --- a/arch/powerpc/boot/crt0.S +++ b/arch/powerpc/boot/crt0.S @@ -51,7 +51,7 @@ _zimage_start: _zimage_start_lib: /* Work out the offset between the address we were linked at and the address where we're running. */ - bl .+4 + bcl 20,31,.+4 p_base: mflr r10 /* r10 now points to runtime addr of p_base */ #ifndef __powerpc64__ /* grab the link address of the dynamic section in r11 */ @@ -274,7 +274,7 @@ prom: mtsrr1 r10 /* Load FW address, set LR to label 1, and jump to FW */ - bl 0f + bcl 20,31,0f 0: mflr r10 addi r11,r10,(1f-0b) mtlr r11 |