system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-20 11:07:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
* '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
This commit is contained in:
Linus Torvalds 2007-09-19 11:45:32 -07:00
parent c39c06b961 09abbcffb3
commit a88a8eff1e
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/mips/dec/setup.c
View file

@ -55,7 +55,7 @@ EXPORT_SYMBOL(dec_kn_slot_size);
int dec_tc_bus; int dec_tc_bus;
spinlock_t ioasic_ssr_lock; DEFINE_SPINLOCK(ioasic_ssr_lock);
volatile u32 *ioasic_base; volatile u32 *ioasic_base;

4
arch/mips/kernel/cpu-bugs64.c
View file

@ -1,5 +1,5 @@
/* /*
* 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 * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * 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" ".endr\n\t"
".set pop" ".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, static inline void mult_sh_align_mod(long *v1, long *v2, long *w,

4
include/asm-mips/compiler.h
View file

@ -1,5 +1,5 @@
/* /*
* 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 * 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 * License. See the file "COPYING" in the main directory of this archive
@ -9,8 +9,10 @@
#define _ASM_COMPILER_H #define _ASM_COMPILER_H
#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
#define GCC_IMM_ASM "n"
#define GCC_REG_ACCUM "$0" #define GCC_REG_ACCUM "$0"
#else #else
#define GCC_IMM_ASM "rn"
#define GCC_REG_ACCUM "accum" #define GCC_REG_ACCUM "accum"
#endif #endif