From: "Paul E. McKenney" Remove the rmb() from mce_log(), since the immunized version of rcu_dereference() makes it unnecessary. Signed-off-by: Paul E. McKenney Cc: Ingo Molnar Cc: Andi Kleen Signed-off-by: Andrew Morton --- arch/x86_64/kernel/mce.c | 3 --- 1 files changed, 3 deletions(-) diff -puN arch/x86_64/kernel/mce.c~remove-workaround-for-unimmunized-rcu_dereference-from-mce_log arch/x86_64/kernel/mce.c --- a/arch/x86_64/kernel/mce.c~remove-workaround-for-unimmunized-rcu_dereference-from-mce_log +++ a/arch/x86_64/kernel/mce.c @@ -76,9 +76,6 @@ void mce_log(struct mce *mce) wmb(); for (;;) { entry = rcu_dereference(mcelog.next); - /* The rmb forces the compiler to reload next in each - iteration */ - rmb(); for (;;) { /* When the buffer fills up discard new entries. Assume that the earlier errors are the more interesting. */ _