Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Gcc 4.0 fixes.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

+11 -9
+6 -4
arch/mips/kernel/signal32.c
··· 261 261 262 262 if (act) { 263 263 old_sigset_t mask; 264 + s32 handler; 264 265 265 266 if (!access_ok(VERIFY_READ, act, sizeof(*act))) 266 267 return -EFAULT; 267 - err |= __get_user((u32)(u64)new_ka.sa.sa_handler, 268 - &act->sa_handler); 268 + err |= __get_user(handler, &act->sa_handler); 269 + new_ka.sa.sa_handler = (void*)(s64)handler; 269 270 err |= __get_user(new_ka.sa.sa_flags, &act->sa_flags); 270 271 err |= __get_user(mask, &act->sa_mask.sig[0]); 271 272 if (err) ··· 827 826 goto out; 828 827 829 828 if (act) { 829 + s32 handler; 830 830 int err = 0; 831 831 832 832 if (!access_ok(VERIFY_READ, act, sizeof(*act))) 833 833 return -EFAULT; 834 - err |= __get_user((u32)(u64)new_sa.sa.sa_handler, 835 - &act->sa_handler); 834 + err |= __get_user(handler, &act->sa_handler); 835 + new_sa.sa.sa_handler = (void*)(s64)handler; 836 836 err |= __get_user(new_sa.sa.sa_flags, &act->sa_flags); 837 837 err |= get_sigset(&new_sa.sa.sa_mask, &act->sa_mask); 838 838 if (err)
+1 -1
arch/mips/mm/c-sb1.c
··· 235 235 /* 236 236 * Invalidate all caches on this CPU 237 237 */ 238 - static void local_sb1___flush_cache_all(void) 238 + static void __attribute_used__ local_sb1___flush_cache_all(void) 239 239 { 240 240 __sb1_writeback_inv_dcache_all(); 241 241 __sb1_flush_icache_all();
+4 -4
include/asm-mips/paccess.h
··· 52 52 }) 53 53 54 54 #define __get_dbe_asm(insn) \ 55 - ({ \ 55 + { \ 56 56 __asm__ __volatile__( \ 57 57 "1:\t" insn "\t%1,%2\n\t" \ 58 58 "move\t%0,$0\n" \ ··· 67 67 ".previous" \ 68 68 :"=r" (__gu_err), "=r" (__gu_val) \ 69 69 :"o" (__mp(__gu_addr)), "i" (-EFAULT)); \ 70 - }) 70 + } 71 71 72 72 extern void __get_dbe_unknown(void); 73 73 ··· 90 90 }) 91 91 92 92 #define __put_dbe_asm(insn) \ 93 - ({ \ 93 + { \ 94 94 __asm__ __volatile__( \ 95 95 "1:\t" insn "\t%1,%2\n\t" \ 96 96 "move\t%0,$0\n" \ ··· 104 104 ".previous" \ 105 105 : "=r" (__pu_err) \ 106 106 : "r" (__pu_val), "o" (__mp(__pu_addr)), "i" (-EFAULT)); \ 107 - }) 107 + } 108 108 109 109 extern void __put_dbe_unknown(void); 110 110