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

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] cpu-bugs64.c: GCC 3.3 constraint workaround
[MIPS] DEC: Initialise ioasic_ssr_lock

+6 -4
+1 -1
arch/mips/dec/setup.c
··· 55 55 56 56 int dec_tc_bus; 57 57 58 - spinlock_t ioasic_ssr_lock; 58 + DEFINE_SPINLOCK(ioasic_ssr_lock); 59 59 60 60 volatile u32 *ioasic_base; 61 61
+2 -2
arch/mips/kernel/cpu-bugs64.c
··· 1 1 /* 2 - * Copyright (C) 2003, 2004 Maciej W. Rozycki 2 + * Copyright (C) 2003, 2004, 2007 Maciej W. Rozycki 3 3 * 4 4 * This program is free software; you can redistribute it and/or 5 5 * modify it under the terms of the GNU General Public License ··· 29 29 ".endr\n\t" 30 30 ".set pop" 31 31 : 32 - : "rn" (align), "rn" (mod)); 32 + : GCC_IMM_ASM (align), GCC_IMM_ASM (mod)); 33 33 } 34 34 35 35 static inline void mult_sh_align_mod(long *v1, long *v2, long *w,
+3 -1
include/asm-mips/compiler.h
··· 1 1 /* 2 - * Copyright (C) 2004 Maciej W. Rozycki 2 + * Copyright (C) 2004, 2007 Maciej W. Rozycki 3 3 * 4 4 * This file is subject to the terms and conditions of the GNU General Public 5 5 * License. See the file "COPYING" in the main directory of this archive ··· 9 9 #define _ASM_COMPILER_H 10 10 11 11 #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) 12 + #define GCC_IMM_ASM "n" 12 13 #define GCC_REG_ACCUM "$0" 13 14 #else 15 + #define GCC_IMM_ASM "rn" 14 16 #define GCC_REG_ACCUM "accum" 15 17 #endif 16 18