diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-04 10:55:19 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-04 10:55:19 -0800 |
commit | 36bbbd0e234d817938bdc52121a0f5473b3e58f5 (patch) | |
tree | 7ca4bc8320bc75848e2b0f42328d6756f763db1d /init | |
parent | f4f6a2e329523e1a795e5e5c0799feee997aa053 (diff) | |
parent | 1b04fa9900263b4e217ca2509fd778b32c2b4eb2 (diff) | |
download | linux-36bbbd0e234d817938bdc52121a0f5473b3e58f5.tar.gz linux-36bbbd0e234d817938bdc52121a0f5473b3e58f5.tar.bz2 linux-36bbbd0e234d817938bdc52121a0f5473b3e58f5.zip |
Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu
Pull RCU fix from Paul McKenney:
"This is a fix for a regression in the v5.10 merge window, but it was
reported quite late in the v5.10 process, plus generating and testing
the fix took some time.
The regression is due to commit 36dadef23fcc ("kprobes: Init kprobes
in early_initcall") which on powerpc can use RCU Tasks before
initialization, resulting in boot failures.
The fix is straightforward, simply moving initialization of RCU Tasks
before the early_initcall()s. The fix has been exposed to -next and
kbuild test robot testing, and has been tested by the PowerPC guys"
* 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu:
rcu-tasks: Move RCU-tasks initialization to before early_initcall()
Diffstat (limited to 'init')
-rw-r--r-- | init/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index 6feee7f11eaf..421640fca375 100644 --- a/init/main.c +++ b/init/main.c @@ -1518,6 +1518,7 @@ static noinline void __init kernel_init_freeable(void) init_mm_internals(); + rcu_init_tasks_generic(); do_pre_smp_initcalls(); lockup_detector_init(); |