Merge branch 'linux-2.6'

7 files changed, 34 insertions, 32 deletions

diff --git a/include/asm-sh64/bug.h b/include/asm-sh64/bug.h
index 81f722efeb63..f3a9c9248ef4 100644
--- a/include/asm-sh64/bug.h
+++ b/include/asm-sh64/bug.h
@@ -1,7 +1,7 @@
 #ifndef __ASM_SH64_BUG_H
 #define __ASM_SH64_BUG_H
 
-
+#ifdef CONFIG_BUG
 /*
  * Tell the user there is some problem, then force a segfault (in process
  * context) or a panic (interrupt context).
@@ -11,17 +11,9 @@
         *(volatile int *)0 = 0; \
 } while (0)
 
-#define BUG_ON(condition) do { \
-        if (unlikely((condition)!=0)) \
-                BUG(); \
-} while(0)
+#define HAVE_ARCH_BUG
+#endif
 
-#define WARN_ON(condition) do { \
-        if (unlikely((condition)!=0)) { \
-                printk("Badness in %s at %s:%d\n", __FUNCTION__, __FILE__, __LINE__); \
-                dump_stack(); \
-        } \
-} while (0)
+#include <asm-generic/bug.h>
 
 #endif /* __ASM_SH64_BUG_H */
-
diff --git a/include/asm-sh64/byteorder.h b/include/asm-sh64/byteorder.h
index f602ebe334eb..7419d78820ee 100644
--- a/include/asm-sh64/byteorder.h
+++ b/include/asm-sh64/byteorder.h
@@ -14,7 +14,7 @@
 
 #include <asm/types.h>
 
-static __inline__ __const__ __u32 ___arch__swab32(__u32 x)
+static inline __attribute_const__ __u32 ___arch__swab32(__u32 x)
 {
         __asm__("byterev        %0, %0\n\t"
                 "shari          %0, 32, %0"
@@ -23,7 +23,7 @@ static __inline__ __const__ __u32 ___arch__swab32(__u32 x)
         return x;
 }
 
-static __inline__ __const__ __u16 ___arch__swab16(__u16 x)
+static inline __attribute_const__ __u16 ___arch__swab16(__u16 x)
 {
         __asm__("byterev        %0, %0\n\t"
                 "shari          %0, 48, %0"
diff --git a/include/asm-sh64/dma-mapping.h b/include/asm-sh64/dma-mapping.h
index a74a49e47922..68e27a8fca31 100644
--- a/include/asm-sh64/dma-mapping.h
+++ b/include/asm-sh64/dma-mapping.h
@@ -126,22 +126,30 @@ static inline void dma_sync_sg(struct device *dev, struct scatterlist *sg,
 static inline void dma_sync_single_for_cpu(struct device *dev,
                                            dma_addr_t dma_handle, size_t size,
                                            enum dma_data_direction dir)
-        __attribute__ ((alias("dma_sync_single")));
+{
+        dma_sync_single(dev, dma_handle, size, dir);
+}
 
 static inline void dma_sync_single_for_device(struct device *dev,
                                            dma_addr_t dma_handle, size_t size,
                                            enum dma_data_direction dir)
-        __attribute__ ((alias("dma_sync_single")));
+{
+        dma_sync_single(dev, dma_handle, size, dir);
+}
 
 static inline void dma_sync_sg_for_cpu(struct device *dev,
                                        struct scatterlist *sg, int nelems,
                                        enum dma_data_direction dir)
-        __attribute__ ((alias("dma_sync_sg")));
+{
+        dma_sync_sg(dev, sg, nelems, dir);
+}
 
 static inline void dma_sync_sg_for_device(struct device *dev,
                                        struct scatterlist *sg, int nelems,
                                        enum dma_data_direction dir)
-        __attribute__ ((alias("dma_sync_sg")));
+{
+        dma_sync_sg(dev, sg, nelems, dir);
+}
 
 static inline int dma_get_cache_alignment(void)
 {
diff --git a/include/asm-sh64/io.h b/include/asm-sh64/io.h
index dee4f77929a4..252fedbb6621 100644
--- a/include/asm-sh64/io.h
+++ b/include/asm-sh64/io.h
@@ -123,6 +123,13 @@ void insw(unsigned long port, void *addr, unsigned long count);
 void outsl(unsigned long port, const void *addr, unsigned long count);
 void insl(unsigned long port, void *addr, unsigned long count);
 
+#define __raw_readb             readb
+#define __raw_readw             readw
+#define __raw_readl             readl
+#define __raw_writeb            writeb
+#define __raw_writew            writew
+#define __raw_writel            writel
+
 void memcpy_toio(void __iomem *to, const void *from, long count);
 void memcpy_fromio(void *to, void __iomem *from, long count);
 
diff --git a/include/asm-sh64/ptrace.h b/include/asm-sh64/ptrace.h
index 56190f521587..a6d4da519db6 100644
--- a/include/asm-sh64/ptrace.h
+++ b/include/asm-sh64/ptrace.h
@@ -28,7 +28,7 @@ struct pt_regs {
 #ifdef __KERNEL__
 #define user_mode(regs) (((regs)->sr & 0x40000000)==0)
 #define instruction_pointer(regs) ((regs)->pc)
-#define profile_pc(regs) instruction_pointer(regs)
+#define profile_pc(regs) ((unsigned long)instruction_pointer(regs))
 extern void show_regs(struct pt_regs *);
 #endif
 
diff --git a/include/asm-sh64/system.h b/include/asm-sh64/system.h
index 87ef6f1ad5a4..b1598c26fcb0 100644
--- a/include/asm-sh64/system.h
+++ b/include/asm-sh64/system.h
@@ -64,7 +64,7 @@ extern void __xchg_called_with_bad_pointer(void);
 #define smp_read_barrier_depends()      do { } while (0)
 #endif /* CONFIG_SMP */
 
-#define set_rmb(var, value) do { xchg(&var, value); } while (0)
+#define set_rmb(var, value) do { (void)xchg(&var, value); } while (0)
 #define set_mb(var, value) set_rmb(var, value)
 
 /* Interrupt Control */
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;                                               \
 })