Skip to content

Commit ac8fc6a

Browse files
jeromemarchandhcahca
authored andcommitted
s390/ftrace: remove preempt_disable()/preempt_enable() pair
It looks like commit ce5e480 ("ftrace: disable preemption when recursion locked") missed a spot in kprobe_ftrace_handler() in arch/s390/kernel/ftrace.c. Remove the superfluous preempt_disable/enable_notrace() there too. Fixes: ce5e480 ("ftrace: disable preemption when recursion locked") Signed-off-by: Jerome Marchand <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Heiko Carstens <[email protected]>
1 parent 41967a3 commit ac8fc6a

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

arch/s390/kernel/ftrace.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,6 @@ void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip,
290290
return;
291291

292292
regs = ftrace_get_regs(fregs);
293-
preempt_disable_notrace();
294293
p = get_kprobe((kprobe_opcode_t *)ip);
295294
if (unlikely(!p) || kprobe_disabled(p))
296295
goto out;
@@ -318,7 +317,6 @@ void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip,
318317
}
319318
__this_cpu_write(current_kprobe, NULL);
320319
out:
321-
preempt_enable_notrace();
322320
ftrace_test_recursion_unlock(bit);
323321
}
324322
NOKPROBE_SYMBOL(kprobe_ftrace_handler);

0 commit comments

Comments
 (0)