git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
sparc64
/
kernel
/
pci_psycho.c
diff --git
a/arch/sparc64/kernel/pci_psycho.c
b/arch/sparc64/kernel/pci_psycho.c
index
2dacbd7
..
41fe099
100644
(file)
--- a/
arch/sparc64/kernel/pci_psycho.c
+++ b/
arch/sparc64/kernel/pci_psycho.c
@@
-433,7
+433,7
@@
enum psycho_error_type {
#define PSYCHO_STCLINE_VALID 0x0000000000000002UL /* Valid */
#define PSYCHO_STCLINE_FOFN 0x0000000000000001UL /* Fetch Outstanding / Flush Necessary */
#define PSYCHO_STCLINE_VALID 0x0000000000000002UL /* Valid */
#define PSYCHO_STCLINE_FOFN 0x0000000000000001UL /* Fetch Outstanding / Flush Necessary */
-static
spinlock_t stc_buf_lock = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(stc_buf_lock)
;
static unsigned long stc_error_buf[128];
static unsigned long stc_tag_buf[16];
static unsigned long stc_line_buf[16];
static unsigned long stc_error_buf[128];
static unsigned long stc_tag_buf[16];
static unsigned long stc_line_buf[16];
@@
-453,9
+453,9
@@
static void __psycho_check_one_stc(struct pci_controller_info *p,
tag_base = regbase + PSYCHO_STC_TAG_A;
line_base = regbase + PSYCHO_STC_LINE_A;
} else {
tag_base = regbase + PSYCHO_STC_TAG_A;
line_base = regbase + PSYCHO_STC_LINE_A;
} else {
- err_base = regbase + PSYCHO_STC_ERR_
A
;
- tag_base = regbase + PSYCHO_STC_TAG_
A
;
- line_base = regbase + PSYCHO_STC_LINE_
A
;
+ err_base = regbase + PSYCHO_STC_ERR_
B
;
+ tag_base = regbase + PSYCHO_STC_TAG_
B
;
+ line_base = regbase + PSYCHO_STC_LINE_
B
;
}
spin_lock(&stc_buf_lock);
}
spin_lock(&stc_buf_lock);