diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-12-04 09:52:30 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-12-04 09:52:30 +0300 |
| commit | 4bbfd7467cfc7d42e18d3008fa6a28ffd56e901a (patch) | |
| tree | 3b6d27e740976d0393fd13ae675ae6a0e07812a9 /arch/sparc | |
| parent | 2595646791c319cadfdbf271563aac97d0843dc7 (diff) | |
| parent | 5ac7cdc29897e5fc3f5e214f3f8c8b03ef8d7029 (diff) | |
| download | linux-4bbfd7467cfc7d42e18d3008fa6a28ffd56e901a.tar.xz | |
Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull RCU changes from Paul E. McKenney:
- Convert RCU's BUG_ON() and similar calls to WARN_ON() and similar.
- Replace calls of RCU-bh and RCU-sched update-side functions
to their vanilla RCU counterparts. This series is a step
towards complete removal of the RCU-bh and RCU-sched update-side
functions.
( Note that some of these conversions are going upstream via their
respective maintainers. )
- Documentation updates, including a number of flavor-consolidation
updates from Joel Fernandes.
- Miscellaneous fixes.
- Automate generation of the initrd filesystem used for
rcutorture testing.
- Convert spin_is_locked() assertions to instead use lockdep.
( Note that some of these conversions are going upstream via their
respective maintainers. )
- SRCU updates, especially including a fix from Dennis Krein
for a bag-on-head-class bug.
- RCU torture-test updates.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/oprofile/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/oprofile/init.c b/arch/sparc/oprofile/init.c index f9024bccff16..43730c9b1c86 100644 --- a/arch/sparc/oprofile/init.c +++ b/arch/sparc/oprofile/init.c @@ -53,7 +53,7 @@ static void timer_stop(void) { nmi_adjust_hz(1); unregister_die_notifier(&profile_timer_exceptions_nb); - synchronize_sched(); /* Allow already-started NMIs to complete. */ + synchronize_rcu(); /* Allow already-started NMIs to complete. */ } static int op_nmi_timer_init(struct oprofile_operations *ops) |