---

yaml
---
r: 9457
b: refs/heads/master
c: 7644143
h: refs/heads/master
i:
  9455: 6f06751
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d318d774789657c37a5e994a4a2cf59d4879ae7
+refs/heads/master: 7644143cd6f7e029f3a8ea64f5fb0ab33ec39f72

trunk/arch/x86_64/kernel/mce.c

@@ -54,9 +54,12 @@ void mce_log(struct mce *mce)
 {
 	unsigned next, entry;
 	mce->finished = 0;
-	smp_wmb();
+	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. */
@@ -69,16 +72,17 @@ void mce_log(struct mce *mce)
 				entry++;
 				continue;
 			}
+			break;
 		}
 		smp_rmb();
 		next = entry + 1;
 		if (cmpxchg(&mcelog.next, entry, next) == entry)
 			break;
 	}
 	memcpy(mcelog.entry + entry, mce, sizeof(struct mce));
-	smp_wmb();
+	wmb();
 	mcelog.entry[entry].finished = 1;
-	smp_wmb();
+	wmb();
 
 	if (!test_and_set_bit(0, &console_logged))
 		notify_user = 1;