Commit 4a0fa886 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'for-mingo' of...

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:

- A one-line change that affects only Tiny RCU that is needed
  by the RISC-V guys, courtesy of Christoph Hellwig.

- An update to my email address.  The old one still works, at
  least most of the time.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 6c06b66e 049b4050
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -9348,7 +9348,7 @@ M: Nicholas Piggin <npiggin@gmail.com>
M:	David Howells <dhowells@redhat.com>
M:	Jade Alglave <j.alglave@ucl.ac.uk>
M:	Luc Maranget <luc.maranget@inria.fr>
M:	"Paul E. McKenney" <paulmck@linux.ibm.com>
M:	"Paul E. McKenney" <paulmck@kernel.org>
R:	Akira Yokosawa <akiyks@gmail.com>
R:	Daniel Lustig <dlustig@nvidia.com>
L:	linux-kernel@vger.kernel.org
@@ -10377,7 +10377,7 @@ F: drivers/platform/x86/mlx-platform.c

MEMBARRIER SUPPORT
M:	Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
M:	"Paul E. McKenney" <paulmck@linux.ibm.com>
M:	"Paul E. McKenney" <paulmck@kernel.org>
L:	linux-kernel@vger.kernel.org
S:	Supported
F:	kernel/sched/membarrier.c
@@ -13492,7 +13492,7 @@ S: Orphan
F:	drivers/net/wireless/ray*

RCUTORTURE TEST FRAMEWORK
M:	"Paul E. McKenney" <paulmck@linux.ibm.com>
M:	"Paul E. McKenney" <paulmck@kernel.org>
M:	Josh Triplett <josh@joshtriplett.org>
R:	Steven Rostedt <rostedt@goodmis.org>
R:	Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
@@ -13539,7 +13539,7 @@ F: arch/x86/include/asm/resctrl_sched.h
F:	Documentation/x86/resctrl*

READ-COPY UPDATE (RCU)
M:	"Paul E. McKenney" <paulmck@linux.ibm.com>
M:	"Paul E. McKenney" <paulmck@kernel.org>
M:	Josh Triplett <josh@joshtriplett.org>
R:	Steven Rostedt <rostedt@goodmis.org>
R:	Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
@@ -13697,7 +13697,7 @@ F: include/linux/reset-controller.h
RESTARTABLE SEQUENCES SUPPORT
M:	Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
M:	Peter Zijlstra <peterz@infradead.org>
M:	"Paul E. McKenney" <paulmck@linux.ibm.com>
M:	"Paul E. McKenney" <paulmck@kernel.org>
M:	Boqun Feng <boqun.feng@gmail.com>
L:	linux-kernel@vger.kernel.org
S:	Supported
@@ -14732,7 +14732,7 @@ F: mm/sl?b*

SLEEPABLE READ-COPY UPDATE (SRCU)
M:	Lai Jiangshan <jiangshanlai@gmail.com>
M:	"Paul E. McKenney" <paulmck@linux.ibm.com>
M:	"Paul E. McKenney" <paulmck@kernel.org>
M:	Josh Triplett <josh@joshtriplett.org>
R:	Steven Rostedt <rostedt@goodmis.org>
R:	Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
@@ -16229,7 +16229,7 @@ F: drivers/platform/x86/topstar-laptop.c

TORTURE-TEST MODULES
M:	Davidlohr Bueso <dave@stgolabs.net>
M:	"Paul E. McKenney" <paulmck@linux.ibm.com>
M:	"Paul E. McKenney" <paulmck@kernel.org>
M:	Josh Triplett <josh@joshtriplett.org>
L:	linux-kernel@vger.kernel.org
S:	Supported
+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@
#ifndef __LINUX_TINY_H
#define __LINUX_TINY_H

#include <linux/ktime.h>
#include <asm/param.h> /* for HZ */

/* Never flag non-existent other CPUs! */
static inline bool rcu_eqs_special_set(int cpu) { return false; }