aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2007-10-17 02:26:05 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 11:42:46 -0400
commit3806204ca9017a2cf2d849430f26e2b62666f5b2 (patch)
treee695a56680e296be0e848550fa374af85276c9e7
parent97b430320ce7c95f0d5587c5ecc8f6a9d0c698e9 (diff)
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>
-rw-r--r--arch/x86/kernel/mce_64.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kernel/mce_64.c b/arch/x86/kernel/mce_64.c
index a66d607f5b92..97d2b757d6bd 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)
76 wmb(); 76 wmb();
77 for (;;) { 77 for (;;) {
78 entry = rcu_dereference(mcelog.next); 78 entry = rcu_dereference(mcelog.next);
79 /* The rmb forces the compiler to reload next in each
80 iteration */
81 rmb();
82 for (;;) { 79 for (;;) {
83 /* When the buffer fills up discard new entries. Assume 80 /* When the buffer fills up discard new entries. Assume
84 that the earlier errors are the more interesting. */ 81 that the earlier errors are the more interesting. */