git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cris: use asm-generic/scatterlist.h
[safe/jmp/linux-2.6]
/
arch
/
mips
/
dec
/
kn01-berr.c
diff --git
a/arch/mips/dec/kn01-berr.c
b/arch/mips/dec/kn01-berr.c
index
b0dc6d5
..
94d23b4
100644
(file)
--- a/
arch/mips/dec/kn01-berr.c
+++ b/
arch/mips/dec/kn01-berr.c
@@
-46,7
+46,7
@@
* There is no default value -- it has to be initialized.
*/
u16 cached_kn01_csr;
* There is no default value -- it has to be initialized.
*/
u16 cached_kn01_csr;
-
DEFINE
_SPINLOCK(kn01_lock);
+
static DEFINE_RAW
_SPINLOCK(kn01_lock);
static inline void dec_kn01_be_ack(void)
static inline void dec_kn01_be_ack(void)
@@
-54,12
+54,12
@@
static inline void dec_kn01_be_ack(void)
volatile u16 *csr = (void *)CKSEG1ADDR(KN01_SLOT_BASE + KN01_CSR);
unsigned long flags;
volatile u16 *csr = (void *)CKSEG1ADDR(KN01_SLOT_BASE + KN01_CSR);
unsigned long flags;
- spin_lock_irqsave(&kn01_lock, flags);
+
raw_
spin_lock_irqsave(&kn01_lock, flags);
*csr = cached_kn01_csr | KN01_CSR_MEMERR; /* Clear bus IRQ. */
iob();
*csr = cached_kn01_csr | KN01_CSR_MEMERR; /* Clear bus IRQ. */
iob();
- spin_unlock_irqrestore(&kn01_lock, flags);
+
raw_
spin_unlock_irqrestore(&kn01_lock, flags);
}
static int dec_kn01_be_backend(struct pt_regs *regs, int is_fixup, int invoker)
}
static int dec_kn01_be_backend(struct pt_regs *regs, int is_fixup, int invoker)
@@
-182,7
+182,7
@@
void __init dec_kn01_be_init(void)
volatile u16 *csr = (void *)CKSEG1ADDR(KN01_SLOT_BASE + KN01_CSR);
unsigned long flags;
volatile u16 *csr = (void *)CKSEG1ADDR(KN01_SLOT_BASE + KN01_CSR);
unsigned long flags;
- spin_lock_irqsave(&kn01_lock, flags);
+
raw_
spin_lock_irqsave(&kn01_lock, flags);
/* Preset write-only bits of the Control Register cache. */
cached_kn01_csr = *csr;
/* Preset write-only bits of the Control Register cache. */
cached_kn01_csr = *csr;
@@
-194,7
+194,7
@@
void __init dec_kn01_be_init(void)
*csr = cached_kn01_csr;
iob();
*csr = cached_kn01_csr;
iob();
- spin_unlock_irqrestore(&kn01_lock, flags);
+
raw_
spin_unlock_irqrestore(&kn01_lock, flags);
/* Clear any leftover errors from the firmware. */
dec_kn01_be_ack();
/* Clear any leftover errors from the firmware. */
dec_kn01_be_ack();