From 542f3082c47e0d81eedfc05b531175ff397d6e6b Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Fri, 10 Feb 2006 01:31:24 +0000 Subject: [PATCH] --- yaml --- r: 20295 b: refs/heads/master c: 3218357c94af92478ef39163163a81e654385320 h: refs/heads/master i: 20293: 872ceebfbf252d25c1894471562ae1fcc4968e47 20291: 6b4d8eb3b8ed12d78b15eeff142aa0b0afe43fb8 20287: db79bcdf6af1a21517d42ad139ff72fa8654951c v: v3 --- [refs] | 2 +- trunk/include/asm-mips/uaccess.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 65ec747f73d4..89fd64cf5f7e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41700e73995d6c814932cb55e12525bd34be1ca5 +refs/heads/master: 3218357c94af92478ef39163163a81e654385320 diff --git a/trunk/include/asm-mips/uaccess.h b/trunk/include/asm-mips/uaccess.h index 91d813a37823..7a553e9d44d3 100644 --- a/trunk/include/asm-mips/uaccess.h +++ b/trunk/include/asm-mips/uaccess.h @@ -266,6 +266,8 @@ do { \ */ #define __get_user_asm_ll32(val, addr) \ { \ + unsigned long long __gu_tmp; \ + \ __asm__ __volatile__( \ "1: lw %1, (%3) \n" \ "2: lw %D1, 4(%3) \n" \ @@ -280,8 +282,9 @@ do { \ " " __UA_ADDR " 1b, 4b \n" \ " " __UA_ADDR " 2b, 4b \n" \ " .previous \n" \ - : "=r" (__gu_err), "=&r" (val) \ + : "=r" (__gu_err), "=&r" (__gu_tmp) \ : "0" (0), "r" (addr), "i" (-EFAULT)); \ + (val) = __gu_tmp; \ } /*