diff options
author | Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> | 2009-01-19 19:37:41 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-21 06:34:44 -0500 |
commit | cc86c9e0dc1a41451240b948bb39d46bb2536ae8 (patch) | |
tree | 8e1e9e3bd654d2b918e99ebfd44dc9c9bf15402d | |
parent | 4d5d783896fc8c37be88ee5837ca9b3c13fcd55b (diff) |
x86: uaccess: rename __put_user_u64() to __put_user_asm_u64()
Impact: cleanup
rename __put_user_u64() to __put_user_asm_u64() like __get_user_asm_u64().
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | arch/x86/include/asm/uaccess.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h index aeb3c1b074c2..69d2757cca9b 100644 --- a/arch/x86/include/asm/uaccess.h +++ b/arch/x86/include/asm/uaccess.h | |||
@@ -186,7 +186,7 @@ extern int __get_user_bad(void); | |||
186 | 186 | ||
187 | 187 | ||
188 | #ifdef CONFIG_X86_32 | 188 | #ifdef CONFIG_X86_32 |
189 | #define __put_user_u64(x, addr, err) \ | 189 | #define __put_user_asm_u64(x, addr, err) \ |
190 | asm volatile("1: movl %%eax,0(%2)\n" \ | 190 | asm volatile("1: movl %%eax,0(%2)\n" \ |
191 | "2: movl %%edx,4(%2)\n" \ | 191 | "2: movl %%edx,4(%2)\n" \ |
192 | "3:\n" \ | 192 | "3:\n" \ |
@@ -203,7 +203,7 @@ extern int __get_user_bad(void); | |||
203 | asm volatile("call __put_user_8" : "=a" (__ret_pu) \ | 203 | asm volatile("call __put_user_8" : "=a" (__ret_pu) \ |
204 | : "A" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx") | 204 | : "A" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx") |
205 | #else | 205 | #else |
206 | #define __put_user_u64(x, ptr, retval) \ | 206 | #define __put_user_asm_u64(x, ptr, retval) \ |
207 | __put_user_asm(x, ptr, retval, "q", "", "Zr", -EFAULT) | 207 | __put_user_asm(x, ptr, retval, "q", "", "Zr", -EFAULT) |
208 | #define __put_user_x8(x, ptr, __ret_pu) __put_user_x(8, x, ptr, __ret_pu) | 208 | #define __put_user_x8(x, ptr, __ret_pu) __put_user_x(8, x, ptr, __ret_pu) |
209 | #endif | 209 | #endif |
@@ -279,7 +279,7 @@ do { \ | |||
279 | __put_user_asm(x, ptr, retval, "l", "k", "ir", errret); \ | 279 | __put_user_asm(x, ptr, retval, "l", "k", "ir", errret); \ |
280 | break; \ | 280 | break; \ |
281 | case 8: \ | 281 | case 8: \ |
282 | __put_user_u64((__typeof__(*ptr))(x), ptr, retval); \ | 282 | __put_user_asm_u64((__typeof__(*ptr))(x), ptr, retval); \ |
283 | break; \ | 283 | break; \ |
284 | default: \ | 284 | default: \ |
285 | __put_user_bad(); \ | 285 | __put_user_bad(); \ |