Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6:
  sh64: Add a sane pm_power_off implementation.
  sh64: Use generic BUG_ON()/WARN_ON().
  sh64: Trivial build fixes.
  sh64: Drop deprecated ISA tuning for legacy toolchains.

1 files changed, 7 insertions, 12 deletions

diff --git a/include/asm-sh64/uaccess.h b/include/asm-sh64/uaccess.h
index f4936d8fa617..644c67b65f94 100644
--- a/include/asm-sh64/uaccess.h
+++ b/include/asm-sh64/uaccess.h
@@ -128,25 +128,20 @@ do {								\
 
 #define __get_user_nocheck(x,ptr,size)                          \
 ({                                                              \
-        long __gu_addr = (long)(ptr);                           \
-        long __gu_err;                                          \
-        __typeof(*(ptr)) __gu_val;                              \
-        __asm__ ("":"=r" (__gu_val));                           \
-        __asm__ ("":"=r" (__gu_err));                           \
-        __get_user_size((void *)&__gu_val, __gu_addr, (size), __gu_err); \
-        (x) = (__typeof__(*(ptr))) __gu_val;                    \
+        long __gu_err, __gu_val;                                \
+        __get_user_size((void *)&__gu_val, (long)(ptr),         \
+                        (size), __gu_err);                      \
+        (x) = (__typeof__(*(ptr)))__gu_val;                     \
         __gu_err;                                               \
 })
 
 #define __get_user_check(x,ptr,size)                            \
 ({                                                              \
         long __gu_addr = (long)(ptr);                           \
-        long __gu_err = -EFAULT;                                \
-        __typeof(*(ptr)) __gu_val;                              \
-        __asm__ ("":"=r" (__gu_val));                           \
-        __asm__ ("":"=r" (__gu_err));                           \
+        long __gu_err = -EFAULT, __gu_val;                      \
         if (__access_ok(__gu_addr, (size)))                     \
-                __get_user_size((void *)&__gu_val, __gu_addr, (size), __gu_err); \
+                __get_user_size((void *)&__gu_val, __gu_addr,   \
+                                (size), __gu_err);              \
         (x) = (__typeof__(*(ptr))) __gu_val;                    \
         __gu_err;                                               \
 })