mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-03-18 13:04:18 +00:00
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
This commit is contained in:
commit
a88a8eff1e
3 changed files with 6 additions and 4 deletions
|
@ -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;
|
||||
|
||||
|
|
|
@ -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
|
||||
* 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,
|
||||
|
|
|
@ -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
|
||||
* 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
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue