Skip to content

Commit 82423b4

Browse files
committed
Merge tag 'smp-urgent-2020-11-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull smp fix from Thomas Gleixner: "A single fix for stop machine. Mark functions no trace to prevent a crash caused by recursion when enabling or disabling a tracer on RISC-V (probably all architectures which patch through stop machine)" * tag 'smp-urgent-2020-11-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: stop_machine, rcu: Mark functions as notrace
2 parents 8d99084 + 4230e2d commit 82423b4

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

kernel/rcu/tree.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ bool rcu_eqs_special_set(int cpu)
409409
*
410410
* The caller must have disabled interrupts and must not be idle.
411411
*/
412-
void rcu_momentary_dyntick_idle(void)
412+
notrace void rcu_momentary_dyntick_idle(void)
413413
{
414414
int special;
415415

kernel/stop_machine.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ static void ack_state(struct multi_stop_data *msdata)
178178
set_state(msdata, msdata->state + 1);
179179
}
180180

181-
void __weak stop_machine_yield(const struct cpumask *cpumask)
181+
notrace void __weak stop_machine_yield(const struct cpumask *cpumask)
182182
{
183183
cpu_relax();
184184
}

0 commit comments

Comments
 (0)