From: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Date: Wed, 17 Oct 2007 06:26:05 +0000 (-0700)
Subject: Remove workaround for unimmunized rcu_dereference from mce_log()
X-Git-Tag: v2.6.24-rc1~777
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=3806204ca9017a2cf2d849430f26e2b62666f5b2;p=~andy%2Flinux

Remove workaround for unimmunized rcu_dereference from mce_log()

Remove the rmb() from mce_log(), since the immunized version of
rcu_dereference() makes it unnecessary.

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/arch/x86/kernel/mce_64.c b/arch/x86/kernel/mce_64.c
index a66d607f5b9..97d2b757d6b 100644
--- a/arch/x86/kernel/mce_64.c
+++ b/arch/x86/kernel/mce_64.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. */