From ccbf5b6a5241d240bb2f3076fdd0d2028b0cb8e2 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Mon, 20 Jul 2009 23:27:39 -0700 Subject: [PATCH] --- yaml --- r: 155819 b: refs/heads/master c: ebe119cd0929df4878f758ebf880cb435e4dcaaf h: refs/heads/master i: 155817: 46ab343e473a4dd8110fd4fad076a1bc96df6ae3 155815: 79f7191c77443d0e09910456c31dfc6feb2e0721 v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/uaccess.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c0aa9ff43612..8f244cb91bc3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 155b73529583c38f30fd394d692b15a893960782 +refs/heads/master: ebe119cd0929df4878f758ebf880cb435e4dcaaf diff --git a/trunk/arch/x86/include/asm/uaccess.h b/trunk/arch/x86/include/asm/uaccess.h index 20e6a795e160..d2c6c930b491 100644 --- a/trunk/arch/x86/include/asm/uaccess.h +++ b/trunk/arch/x86/include/asm/uaccess.h @@ -212,9 +212,9 @@ extern int __get_user_bad(void); : "A" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx") #else #define __put_user_asm_u64(x, ptr, retval, errret) \ - __put_user_asm(x, ptr, retval, "q", "", "Zr", errret) + __put_user_asm(x, ptr, retval, "q", "", "er", errret) #define __put_user_asm_ex_u64(x, addr) \ - __put_user_asm_ex(x, addr, "q", "", "Zr") + __put_user_asm_ex(x, addr, "q", "", "er") #define __put_user_x8(x, ptr, __ret_pu) __put_user_x(8, x, ptr, __ret_pu) #endif