CVS Update@linux-mips.org: linux

[ralf@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ralf@ftp.linux-mips.org 05/03/04 19:36:53

Modified files:
        arch/mips/kernel: signal32.c 
        arch/mips/mm   : c-sb1.c 
        include/asm-mips: paccess.h uaccess.h 

Log message:
        Gcc 4.0 fixes.

diff -urN linux/arch/mips/kernel/signal32.c linux/arch/mips/kernel/signal32.c
--- linux/arch/mips/kernel/signal32.c   2005/02/16 21:24:16     1.25
+++ linux/arch/mips/kernel/signal32.c   2005/03/04 19:36:51     1.26
@@ -266,11 +266,12 @@
 
        if (act) {
                old_sigset_t mask;
+               s32 handler;
 
                if (!access_ok(VERIFY_READ, act, sizeof(*act)))
                        return -EFAULT;
-               err |= __get_user((u32)(u64)new_ka.sa.sa_handler,
-                                 &act->sa_handler);
+               err |= __get_user(handler, &act->sa_handler);
+               new_ka.sa.sa_handler = (void*)(s64)handler;
                err |= __get_user(new_ka.sa.sa_flags, &act->sa_flags);
                err |= __get_user(mask, &act->sa_mask.sig[0]);
                if (err)
@@ -832,12 +833,13 @@
                goto out;
 
        if (act) {
+               s32 handler;
                int err = 0;
 
                if (!access_ok(VERIFY_READ, act, sizeof(*act)))
                        return -EFAULT;
-               err |= __get_user((u32)(u64)new_sa.sa.sa_handler,
-                                 &act->sa_handler);
+               err |= __get_user(handler, &act->sa_handler);
+               new_sa.sa.sa_handler = (void*)(s64)handler;
                err |= __get_user(new_sa.sa.sa_flags, &act->sa_flags);
                err |= get_sigset(&new_sa.sa.sa_mask, &act->sa_mask);
                if (err)
diff -urN linux/arch/mips/mm/c-sb1.c linux/arch/mips/mm/c-sb1.c
--- linux/arch/mips/mm/c-sb1.c  2004/12/09 21:57:03     1.55
+++ linux/arch/mips/mm/c-sb1.c  2005/03/04 19:36:53     1.56
@@ -234,7 +234,7 @@
 /*
  * Invalidate all caches on this CPU
  */
-static void local_sb1___flush_cache_all(void)
+static void __attribute_used__ local_sb1___flush_cache_all(void)
 {
        __sb1_writeback_inv_dcache_all();
        __sb1_flush_icache_all();
diff -urN linux/include/asm-mips/paccess.h linux/include/asm-mips/paccess.h
--- linux/include/asm-mips/paccess.h    2003/07/29 03:21:47     1.4
+++ linux/include/asm-mips/paccess.h    2005/03/04 19:36:53     1.5
@@ -52,7 +52,7 @@
 })
 
 #define __get_dbe_asm(insn)                                            \
-({                                                                     \
+{                                                                      \
        __asm__ __volatile__(                                           \
        "1:\t" insn "\t%1,%2\n\t"                                       \
        "move\t%0,$0\n"                                                 \
@@ -67,7 +67,7 @@
        ".previous"                                                     \
        :"=r" (__gu_err), "=r" (__gu_val)                               \
        :"o" (__mp(__gu_addr)), "i" (-EFAULT));                         \
-})
+}
 
 extern void __get_dbe_unknown(void);
 
@@ -90,7 +90,7 @@
 })
 
 #define __put_dbe_asm(insn)                                            \
-({                                                                     \
+{                                                                      \
        __asm__ __volatile__(                                           \
        "1:\t" insn "\t%1,%2\n\t"                                       \
        "move\t%0,$0\n"                                                 \
@@ -104,7 +104,7 @@
        ".previous"                                                     \
        : "=r" (__pu_err)                                               \
        : "r" (__pu_val), "o" (__mp(__pu_addr)), "i" (-EFAULT));        \
-})
+}
 
 extern void __put_dbe_unknown(void);
 
diff -urN linux/include/asm-mips/uaccess.h linux/include/asm-mips/uaccess.h
--- linux/include/asm-mips/uaccess.h    2005/03/01 19:22:29     1.41
+++ linux/include/asm-mips/uaccess.h    2005/03/04 19:36:53     1.42
@@ -244,7 +244,7 @@
        case 8: __GET_USER_DW(ptr); break;                              \
        default: __get_user_unknown(); break;                           \
        }                                                               \
-       x = (__typeof__(*(ptr))) __gu_val;                              \
+       (x) = (__typeof__(*(ptr))) __gu_val;                            \
        __gu_err;                                                       \
 })
 
@@ -266,12 +266,12 @@
                default: __get_user_unknown(); break;                   \
                }                                                       \
        }                                                               \
-       x = (__typeof__(*(ptr))) __gu_val;                              \
+       (x) = (__typeof__(*(ptr))) __gu_val;                            \
        __gu_err;                                                       \
 })
 
 #define __get_user_asm(insn, addr)                                     \
-({                                                                     \
+{                                                                      \
        __asm__ __volatile__(                                           \
        "1:     " insn "        %1, %3                          \n"     \
        "2:                                                     \n"     \
@@ -284,13 +284,13 @@
        "       .previous                                       \n"     \
        : "=r" (__gu_err), "=r" (__gu_val)                              \
        : "0" (__gu_err), "o" (__m(addr)), "i" (-EFAULT));              \
-})
+}
 
 /*
  * Get a long long 64 using 32 bit registers.
  */
 #define __get_user_asm_ll32(addr)                                      \
-({                                                                     \
+{                                                                      \
        __asm__ __volatile__(                                           \
        "1:     lw      %1, (%3)                                \n"     \
        "2:     lw      %D1, 4(%3)                              \n"     \
@@ -307,7 +307,7 @@
        "       .previous                                       \n"     \
        : "=r" (__gu_err), "=&r" (__gu_val)                             \
        : "0" (__gu_err), "r" (addr), "i" (-EFAULT));                   \
-})
+}
 
 extern void __get_user_unknown(void);
 
@@ -360,7 +360,7 @@
 })
 
 #define __put_user_asm(insn, ptr)                                      \
-({                                                                     \
+{                                                                      \
        __asm__ __volatile__(                                           \
        "1:     " insn "        %z2, %3         # __put_user_asm\n"     \
        "2:                                                     \n"     \
@@ -374,10 +374,10 @@
        : "=r" (__pu_err)                                               \
        : "0" (__pu_err), "Jr" (__pu_val), "o" (__m(ptr)),              \
          "i" (-EFAULT));                                               \
-})
+}
 
 #define __put_user_asm_ll32(ptr)                                       \
-({                                                                     \
+{                                                                      \
        __asm__ __volatile__(                                           \
        "1:     sw      %2, (%3)        # __put_user_asm_ll32   \n"     \
        "2:     sw      %D2, 4(%3)                              \n"     \
@@ -393,7 +393,7 @@
        : "=r" (__pu_err)                                               \
        : "0" (__pu_err), "r" (__pu_val), "r" (ptr),                    \
          "i" (-EFAULT));                                               \
-})
+}
 
 extern void __put_user_unknown(void);