projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 3140e7c0 GKH |
1 | From foo@baz Fri Mar 29 16:04:51 CET 2019 |
| 2 | From: Michael Ellerman <mpe@ellerman.id.au> | |
| 3 | Date: Fri, 29 Mar 2019 22:26:18 +1100 | |
| 4 | Subject: powerpc/fsl: Fixed warning: orphan section `__btb_flush_fixup' | |
| 5 | To: stable@vger.kernel.org, gregkh@linuxfoundation.org | |
| 6 | Cc: linuxppc-dev@ozlabs.org, diana.craciun@nxp.com, msuchanek@suse.de, christophe.leroy@c-s.fr | |
| 7 | Message-ID: <20190329112620.14489-31-mpe@ellerman.id.au> | |
| 8 | ||
| 9 | From: Diana Craciun <diana.craciun@nxp.com> | |
| 10 | ||
| 11 | commit 039daac5526932ec731e4499613018d263af8b3e upstream. | |
| 12 | ||
| 13 | Fixed the following build warning: | |
| 14 | powerpc-linux-gnu-ld: warning: orphan section `__btb_flush_fixup' from | |
| 15 | `arch/powerpc/kernel/head_44x.o' being placed in section | |
| 16 | `__btb_flush_fixup'. | |
| 17 | ||
| 18 | Signed-off-by: Diana Craciun <diana.craciun@nxp.com> | |
| 19 | Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> | |
| 20 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 21 | --- | |
| 22 | arch/powerpc/kernel/head_booke.h | 18 ++++++++++++------ | |
| 23 | 1 file changed, 12 insertions(+), 6 deletions(-) | |
| 24 | ||
| 25 | --- a/arch/powerpc/kernel/head_booke.h | |
| 26 | +++ b/arch/powerpc/kernel/head_booke.h | |
| 27 | @@ -32,6 +32,16 @@ | |
| 28 | */ | |
| 29 | #define THREAD_NORMSAVE(offset) (THREAD_NORMSAVES + (offset * 4)) | |
| 30 | ||
| 31 | +#ifdef CONFIG_PPC_FSL_BOOK3E | |
| 32 | +#define BOOKE_CLEAR_BTB(reg) \ | |
| 33 | +START_BTB_FLUSH_SECTION \ | |
| 34 | + BTB_FLUSH(reg) \ | |
| 35 | +END_BTB_FLUSH_SECTION | |
| 36 | +#else | |
| 37 | +#define BOOKE_CLEAR_BTB(reg) | |
| 38 | +#endif | |
| 39 | + | |
| 40 | + | |
| 41 | #define NORMAL_EXCEPTION_PROLOG(intno) \ | |
| 42 | mtspr SPRN_SPRG_WSCRATCH0, r10; /* save one register */ \ | |
| 43 | mfspr r10, SPRN_SPRG_THREAD; \ | |
| 44 | @@ -43,9 +53,7 @@ | |
| 45 | andi. r11, r11, MSR_PR; /* check whether user or kernel */\ | |
| 46 | mr r11, r1; \ | |
| 47 | beq 1f; \ | |
| 48 | -START_BTB_FLUSH_SECTION \ | |
| 49 | - BTB_FLUSH(r11) \ | |
| 50 | -END_BTB_FLUSH_SECTION \ | |
| 51 | + BOOKE_CLEAR_BTB(r11) \ | |
| 52 | /* if from user, start at top of this thread's kernel stack */ \ | |
| 53 | lwz r11, THREAD_INFO-THREAD(r10); \ | |
| 54 | ALLOC_STACK_FRAME(r11, THREAD_SIZE); \ | |
| 55 | @@ -131,9 +139,7 @@ END_BTB_FLUSH_SECTION \ | |
| 56 | stw r9,_CCR(r8); /* save CR on stack */\ | |
| 57 | mfspr r11,exc_level_srr1; /* check whether user or kernel */\ | |
| 58 | DO_KVM BOOKE_INTERRUPT_##intno exc_level_srr1; \ | |
| 59 | -START_BTB_FLUSH_SECTION \ | |
| 60 | - BTB_FLUSH(r10) \ | |
| 61 | -END_BTB_FLUSH_SECTION \ | |
| 62 | + BOOKE_CLEAR_BTB(r10) \ | |
| 63 | andi. r11,r11,MSR_PR; \ | |
| 64 | mfspr r11,SPRN_SPRG_THREAD; /* if from user, start at top of */\ | |
| 65 | lwz r11,THREAD_INFO-THREAD(r11); /* this thread's kernel stack */\ |