@@ -50,6 +50,7 @@ mcheck_transfer_to_handler:
50
50
mfspr r0,SPRN_DSRR1
51
51
stw r0,_DSRR1(r11)
52
52
/* fall through */
53
+ _ASM_NOKPROBE_SYMBOL(mcheck_transfer_to_handler)
53
54
54
55
.globl debug_transfer_to_handler
55
56
debug_transfer_to_handler:
@@ -58,6 +59,7 @@ debug_transfer_to_handler:
58
59
mfspr r0,SPRN_CSRR1
59
60
stw r0,_CSRR1(r11)
60
61
/* fall through */
62
+ _ASM_NOKPROBE_SYMBOL(debug_transfer_to_handler)
61
63
62
64
.globl crit_transfer_to_handler
63
65
crit_transfer_to_handler:
@@ -93,6 +95,7 @@ crit_transfer_to_handler:
93
95
rlwinm r0,r1,0 ,0 ,(31 - THREAD_SHIFT)
94
96
stw r0,KSP_LIMIT(r8)
95
97
/* fall through */
98
+ _ASM_NOKPROBE_SYMBOL(crit_transfer_to_handler)
96
99
#endif
97
100
98
101
#ifdef CONFIG_40x
@@ -114,6 +117,7 @@ crit_transfer_to_handler:
114
117
rlwinm r0,r1,0 ,0 ,(31 - THREAD_SHIFT)
115
118
stw r0,KSP_LIMIT(r8)
116
119
/* fall through */
120
+ _ASM_NOKPROBE_SYMBOL(crit_transfer_to_handler)
117
121
#endif
118
122
119
123
/*
@@ -126,6 +130,7 @@ crit_transfer_to_handler:
126
130
.globl transfer_to_handler_full
127
131
transfer_to_handler_full:
128
132
SAVE_NVGPRS(r11)
133
+ _ASM_NOKPROBE_SYMBOL(transfer_to_handler_full)
129
134
/* fall through */
130
135
131
136
.globl transfer_to_handler
@@ -226,6 +231,23 @@ transfer_to_handler_cont:
226
231
SYNC
227
232
RFI /* jump to handler, enable MMU */
228
233
234
+ #if defined (CONFIG_PPC_BOOK3S_32) || defined(CONFIG_E500)
235
+ 4: rlwinm r12,r12,0 ,~_TLF_NAPPING
236
+ stw r12,TI_LOCAL_FLAGS(r2)
237
+ b power_save_ppc32_restore
238
+
239
+ 7: rlwinm r12,r12,0 ,~_TLF_SLEEPING
240
+ stw r12,TI_LOCAL_FLAGS(r2)
241
+ lwz r9,_MSR(r11) /* if sleeping, clear MSR.EE */
242
+ rlwinm r9,r9,0 ,~MSR_EE
243
+ lwz r12,_LINK(r11) /* and return to address in LR */
244
+ kuap_restore r11, r2, r3, r4, r5
245
+ lwz r2, GPR2(r11)
246
+ b fast_exception_return
247
+ #endif
248
+ _ASM_NOKPROBE_SYMBOL(transfer_to_handler)
249
+ _ASM_NOKPROBE_SYMBOL(transfer_to_handler_cont)
250
+
229
251
#ifdef CONFIG_TRACE_IRQFLAGS
230
252
1: /* MSR is changing, re-enable MMU so we can notify lockdep. We need to
231
253
* keep interrupts disabled at this point otherwise we might risk
@@ -271,21 +293,6 @@ reenable_mmu:
271
293
bctr /* jump to handler */
272
294
#endif /* CONFIG_TRACE_IRQFLAGS */
273
295
274
- #if defined (CONFIG_PPC_BOOK3S_32) || defined(CONFIG_E500)
275
- 4: rlwinm r12,r12,0 ,~_TLF_NAPPING
276
- stw r12,TI_LOCAL_FLAGS(r2)
277
- b power_save_ppc32_restore
278
-
279
- 7: rlwinm r12,r12,0 ,~_TLF_SLEEPING
280
- stw r12,TI_LOCAL_FLAGS(r2)
281
- lwz r9,_MSR(r11) /* if sleeping, clear MSR.EE */
282
- rlwinm r9,r9,0 ,~MSR_EE
283
- lwz r12,_LINK(r11) /* and return to address in LR */
284
- kuap_restore r11, r2, r3, r4, r5
285
- lwz r2, GPR2(r11)
286
- b fast_exception_return
287
- #endif
288
-
289
296
#ifndef CONFIG_VMAP_STACK
290
297
/*
291
298
* On kernel stack overflow, load up an initial stack pointer
0 commit comments