3 files changed, 8 insertions, 8 deletions

diff --git a/include/asm-m68knommu/processor.h b/include/asm-m68knommu/processor.h
index 0ee158e09abb..9d3a1bf41231 100644
--- a/include/asm-m68knommu/processor.h
+++ b/include/asm-m68knommu/processor.h
@@ -13,6 +13,7 @@
  */
 #define current_text_addr() ({ __label__ _l; _l: &&_l;})
 
+#include <linux/compiler.h>
 #include <linux/threads.h>
 #include <asm/types.h>
 #include <asm/segment.h>
@@ -137,6 +138,6 @@ unsigned long get_wchan(struct task_struct *p);
         eip; })
 #define KSTK_ESP(tsk)   ((tsk) == current ? rdusp() : (tsk)->thread.usp)
 
-#define cpu_relax()    do { } while (0)
+#define cpu_relax()    barrier()
 
 #endif
diff --git a/include/asm-m68knommu/system.h b/include/asm-m68knommu/system.h
index 2bbe2db00a22..2a814498672d 100644
--- a/include/asm-m68knommu/system.h
+++ b/include/asm-m68knommu/system.h
@@ -106,7 +106,6 @@ asmlinkage void resume(void);
 #define wmb()  asm volatile (""   : : :"memory")
 #define set_rmb(var, value)    do { xchg(&var, value); } while (0)
 #define set_mb(var, value)     set_rmb(var, value)
-#define set_wmb(var, value)    do { var = value; wmb(); } while (0)
 
 #ifdef CONFIG_SMP
 #define smp_mb()        mb()
diff --git a/include/asm-m68knommu/uaccess.h b/include/asm-m68knommu/uaccess.h
index 05be9515a2d2..62b29b10bc6d 100644
--- a/include/asm-m68knommu/uaccess.h
+++ b/include/asm-m68knommu/uaccess.h
@@ -93,7 +93,7 @@ extern int __put_user_bad(void);
 #define get_user(x, ptr)                                        \
 ({                                                              \
     int __gu_err = 0;                                           \
-    typeof(*(ptr)) __gu_val = 0;                                \
+    typeof(x) __gu_val = 0;                                     \
     switch (sizeof(*(ptr))) {                                   \
     case 1:                                                     \
         __get_user_asm(__gu_err, __gu_val, ptr, b, "=d");       \
@@ -105,23 +105,23 @@ extern int __put_user_bad(void);
         __get_user_asm(__gu_err, __gu_val, ptr, l, "=r");       \
         break;                                                  \
     case 8:                                                     \
-        memcpy(&__gu_val, ptr, sizeof (*(ptr))); \
+        memcpy((void *) &__gu_val, ptr, sizeof (*(ptr)));       \
         break;                                                  \
     default:                                                    \
         __gu_val = 0;                                           \
         __gu_err = __get_user_bad();                            \
         break;                                                  \
     }                                                           \
-    (x) = __gu_val;                                             \
+    (x) = (typeof(*(ptr))) __gu_val;                            \
     __gu_err;                                                   \
 })
 #define __get_user(x, ptr) get_user(x, ptr)
 
 extern int __get_user_bad(void);
 
-#define __get_user_asm(err,x,ptr,bwl,reg)       \
-        __asm__ ("move" #bwl " %1,%0"                   \
-                 : "=d" (x)                                                     \
+#define __get_user_asm(err,x,ptr,bwl,reg)                       \
+        __asm__ ("move" #bwl " %1,%0"                           \
+                 : "=d" (x)                                     \
                  : "m" (*__ptr(ptr)))
 
 #define copy_from_user(to, from, n)             (memcpy(to, from, n), 0)