From a422d00539659392f7a0b9bae0dfc45c38f48ac7 Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Mon, 15 Oct 2012 11:49:22 +0200
Subject: [PATCH] --- yaml --- r: 344397 b: refs/heads/master c:
 bf0e12c753ee71fa9fcb1210e5b961ba1df7981f h: refs/heads/master i:   344395:
 6ce69bc2ad8ff352789d47acc996bb81ed14b565 v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/microblaze/include/asm/uaccess.h | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9436310d3a4b..f4d6858b38d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4336bac52b85201cf92c775940ee70097471c4e2
+refs/heads/master: bf0e12c753ee71fa9fcb1210e5b961ba1df7981f
diff --git a/trunk/arch/microblaze/include/asm/uaccess.h b/trunk/arch/microblaze/include/asm/uaccess.h
index ef25f7538d4a..927540d3cb7d 100644
--- a/trunk/arch/microblaze/include/asm/uaccess.h
+++ b/trunk/arch/microblaze/include/asm/uaccess.h
@@ -298,11 +298,10 @@ extern long __user_bad(void);
 
 #define __put_user_check(x, ptr, size)					\
 ({									\
-	typeof(*(ptr)) __pu_val;					\
+	typeof(*(ptr)) volatile __pu_val = x;					\
 	typeof(*(ptr)) __user *__pu_addr = (ptr);			\
 	int __pu_err = 0;						\
 									\
-	__pu_val = (x);							\
 	if (access_ok(VERIFY_WRITE, __pu_addr, size)) {			\
 		switch (size) {						\
 		case 1:							\