From 9711032c95e3cdb1e1f506fce4fd7e2c8c17a0ea Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Mon, 23 Mar 2009 16:55:08 +0000
Subject: [PATCH] --- yaml --- r: 138583 b: refs/heads/master c:
 82631f5dd114e52239fb3d1e270a49d37c088b46 h: refs/heads/master i:   138581:
 a11e430d58ce0ee9c913d98d6809399c30d20349   138579:
 f0a95a0557f6e146fd1955b4449eee4022e2eb36   138575:
 edade8d49059bd4c0da4dd13f3d18354b88b7126 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/powerpc/platforms/pseries/dtl.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 375c37078d55..73fe42aedc81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 757c74d298dc8438760b8dea275c4c6e0ac8a77f
+refs/heads/master: 82631f5dd114e52239fb3d1e270a49d37c088b46
diff --git a/trunk/arch/powerpc/platforms/pseries/dtl.c b/trunk/arch/powerpc/platforms/pseries/dtl.c
index dc9b0f81e60f..fafcaa0e81ef 100644
--- a/trunk/arch/powerpc/platforms/pseries/dtl.c
+++ b/trunk/arch/powerpc/platforms/pseries/dtl.c
@@ -107,6 +107,10 @@ static int dtl_enable(struct dtl *dtl)
 	/* set our initial buffer indices */
 	dtl->last_idx = lppaca[dtl->cpu].dtl_idx = 0;
 
+	/* ensure that our updates to the lppaca fields have occurred before
+	 * we actually enable the logging */
+	smp_wmb();
+
 	/* enable event logging */
 	lppaca[dtl->cpu].dtl_enable_mask = dtl_event_mask;