Skip to content

Commit 039daac

Browse files
dmcraciunmpe
authored andcommitted
powerpc/fsl: Fixed warning: orphan section `__btb_flush_fixup'
Fixed the following build warning: powerpc-linux-gnu-ld: warning: orphan section `__btb_flush_fixup' from `arch/powerpc/kernel/head_44x.o' being placed in section `__btb_flush_fixup'. Signed-off-by: Diana Craciun <diana.craciun@nxp.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
1 parent 8d69733 commit 039daac

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

arch/powerpc/kernel/head_booke.h

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,16 @@
3232
*/
3333
#define THREAD_NORMSAVE(offset) (THREAD_NORMSAVES + (offset * 4))
3434

35+
#ifdef CONFIG_PPC_FSL_BOOK3E
36+
#define BOOKE_CLEAR_BTB(reg) \
37+
START_BTB_FLUSH_SECTION \
38+
BTB_FLUSH(reg) \
39+
END_BTB_FLUSH_SECTION
40+
#else
41+
#define BOOKE_CLEAR_BTB(reg)
42+
#endif
43+
44+
3545
#define NORMAL_EXCEPTION_PROLOG(intno) \
3646
mtspr SPRN_SPRG_WSCRATCH0, r10; /* save one register */ \
3747
mfspr r10, SPRN_SPRG_THREAD; \
@@ -43,9 +53,7 @@
4353
andi. r11, r11, MSR_PR; /* check whether user or kernel */\
4454
mr r11, r1; \
4555
beq 1f; \
46-
START_BTB_FLUSH_SECTION \
47-
BTB_FLUSH(r11) \
48-
END_BTB_FLUSH_SECTION \
56+
BOOKE_CLEAR_BTB(r11) \
4957
/* if from user, start at top of this thread's kernel stack */ \
5058
lwz r11, THREAD_INFO-THREAD(r10); \
5159
ALLOC_STACK_FRAME(r11, THREAD_SIZE); \
@@ -131,9 +139,7 @@ END_BTB_FLUSH_SECTION \
131139
stw r9,_CCR(r8); /* save CR on stack */\
132140
mfspr r11,exc_level_srr1; /* check whether user or kernel */\
133141
DO_KVM BOOKE_INTERRUPT_##intno exc_level_srr1; \
134-
START_BTB_FLUSH_SECTION \
135-
BTB_FLUSH(r10) \
136-
END_BTB_FLUSH_SECTION \
142+
BOOKE_CLEAR_BTB(r10) \
137143
andi. r11,r11,MSR_PR; \
138144
mfspr r11,SPRN_SPRG_THREAD; /* if from user, start at top of */\
139145
lwz r11,THREAD_INFO-THREAD(r11); /* this thread's kernel stack */\

0 commit comments

Comments
 (0)