Pull thinkpad-2.6.24 into release branch

[karo-tx-linux.git] / include / asm-m68knommu / system.h

diff --git a/include/asm-m68knommu/system.h b/include/asm-m68knommu/system.h
index 5e5ed18bb78f54185da3d69ecfc0b1e9fd2373f7..15b4c7d45c94a643865b511040cff2e5dcd0e04a 100644 (file)
--- a/include/asm-m68knommu/system.h
+++ b/include/asm-m68knommu/system.h
@@ -104,8 +104,7 @@ asmlinkage void resume(void);
 #define mb()   asm volatile (""   : : :"memory")
 #define rmb()  asm volatile (""   : : :"memory")
 #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_mb(var, value) do { xchg(&var, value); } while (0)
 
 #ifdef CONFIG_SMP
 #define smp_mb()       mb()
@@ -253,8 +252,7 @@ cmpxchg(volatile int *p, int old, int new)
         ");                            \
 })
 #elif defined(CONFIG_NETtel) || defined(CONFIG_eLIA) || \
-      defined(CONFIG_DISKtel) || defined(CONFIG_SECUREEDGEMP3) || \
-      defined(CONFIG_CLEOPATRA)
+      defined(CONFIG_SECUREEDGEMP3) || defined(CONFIG_CLEOPATRA)
 #define HARD_RESET_NOW() ({            \
         asm("                          \
        movew #0x2700, %sr;             \
@@ -296,7 +294,7 @@ cmpxchg(volatile int *p, int old, int new)
 ({                                             \
        unsigned char volatile *reset;          \
        asm("move.w     #0x2700, %sr");         \
-       reset = ((volatile unsigned short *)(MCF_IPSBAR + 0x110000));   \
+       reset = ((volatile unsigned char *)(MCF_IPSBAR + 0x110000));    \
        while(1)                                \
        *reset |= (0x01 << 7);\
 })
@@ -318,7 +316,7 @@ cmpxchg(volatile int *p, int old, int new)
 ({                                     \
        unsigned char volatile *reset;  \
        asm("move.w     #0x2700, %sr"); \
-       reset = ((volatile unsigned short *)(MCF_IPSBAR + 0xA0000));    \
+       reset = ((volatile unsigned char *)(MCF_IPSBAR + 0xA0000));     \
        while(1)                        \
                *reset |= 0x80;         \
 })