Commit a88a8eff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents c39c06b9 09abbcff

arch/mips/dec/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ EXPORT_SYMBOL(dec_kn_slot_size); 


int dec_tc_bus;



spinlock_t ioasic_ssr_lock;

DEFINE_SPINLOCK(ioasic_ssr_lock);



volatile u32 *ioasic_base;

arch/mips/kernel/cpu-bugs64.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2003, 2004  Maciej W. Rozycki

 * Copyright (C) 2003, 2004, 2007  Maciej W. Rozycki

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License
@@ -29,7 +29,7 @@ static inline void align_mod(const int align, const int mod) 
		".endr\n\t"

		".set	pop"

		:

		: "rn" (align), "rn" (mod));

		: GCC_IMM_ASM (align), GCC_IMM_ASM (mod));

}



static inline void mult_sh_align_mod(long *v1, long *v2, long *w,

include/asm-mips/compiler.h

+3 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2004  Maciej W. Rozycki

 * Copyright (C) 2004, 2007  Maciej W. Rozycki

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive
@@ -9,8 +9,10 @@ 
#define _ASM_COMPILER_H



#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)

#define GCC_IMM_ASM "n"

#define GCC_REG_ACCUM "$0"

#else

#define GCC_IMM_ASM "rn"

#define GCC_REG_ACCUM "accum"

#endif