On Wed, Jul 22, 2015 at 10:40:26AM +0200, Borislav Petkov wrote: > From: Borislav Petkov <b...@suse.de> > > The "rcu_" prefix misleads for it being a proper RCU interface which > is not. It basically checks whether we're preemptible or holding the > chrdev_read mutex. > > Rename it accordingly. > > Signed-off-by: Borislav Petkov <b...@suse.de> > Cc: "Paul E. McKenney" <paul...@linux.vnet.ibm.com>
Acked-by: Paul E. McKenney <paul...@linux.vnet.ibm.com> > --- > arch/x86/kernel/cpu/mcheck/mce.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/kernel/cpu/mcheck/mce.c > b/arch/x86/kernel/cpu/mcheck/mce.c > index 5a19adb86b8f..36c065e6fa94 100644 > --- a/arch/x86/kernel/cpu/mcheck/mce.c > +++ b/arch/x86/kernel/cpu/mcheck/mce.c > @@ -52,11 +52,11 @@ > > static DEFINE_MUTEX(mce_chrdev_read_mutex); > > -#define rcu_dereference_check_mce(p) \ > +#define mce_log_get_idx_check(p) \ > ({ \ > rcu_lockdep_assert(rcu_read_lock_sched_held() || \ > lockdep_is_held(&mce_chrdev_read_mutex), \ > - "suspicious rcu_dereference_check_mce() usage"); \ > + "suspicious mce_log_get_idx_check() usage"); \ > smp_load_acquire(&(p)); \ > }) > > @@ -165,7 +165,7 @@ void mce_log(struct mce *mce) > mce->finished = 0; > wmb(); > for (;;) { > - entry = rcu_dereference_check_mce(mcelog.next); > + entry = mce_log_get_idx_check(mcelog.next); > for (;;) { > > /* > @@ -1812,7 +1812,7 @@ static ssize_t mce_chrdev_read(struct file *filp, char > __user *ubuf, > goto out; > } > > - next = rcu_dereference_check_mce(mcelog.next); > + next = mce_log_get_idx_check(mcelog.next); > > /* Only supports full reads right now */ > err = -EINVAL; > -- > 2.5.0.rc2.28.g6003e7f > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/