diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-11-05 19:43:51 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-11-15 18:21:49 -0500 |
commit | 33b75e5c51e119c903681f592b4ec6c772def0e0 (patch) | |
tree | 6a52a667fe9ba5c43e3c5f082354f3233c42f609 /arch/mips/mm/cerr-sb1.c | |
parent | bb856c5b494049584eca61c6069eb8e1b0f9ce35 (diff) |
[MIPS] Sibyte: Replace use of removed IO_SPACE_BASE with IOADDR.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mm/cerr-sb1.c')
-rw-r--r-- | arch/mips/mm/cerr-sb1.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/mm/cerr-sb1.c b/arch/mips/mm/cerr-sb1.c index e7f539e3284b..1bd1f18ac23c 100644 --- a/arch/mips/mm/cerr-sb1.c +++ b/arch/mips/mm/cerr-sb1.c | |||
@@ -154,7 +154,7 @@ static void check_bus_watcher(void) | |||
154 | if (status & ~(1UL << 31)) { | 154 | if (status & ~(1UL << 31)) { |
155 | l2_err = csr_in32(IOADDR(A_BUS_L2_ERRORS)); | 155 | l2_err = csr_in32(IOADDR(A_BUS_L2_ERRORS)); |
156 | #ifdef DUMP_L2_ECC_TAG_ON_ERROR | 156 | #ifdef DUMP_L2_ECC_TAG_ON_ERROR |
157 | l2_tag = in64(IO_SPACE_BASE | A_L2_ECC_TAG); | 157 | l2_tag = in64(IOADDR(A_L2_ECC_TAG)); |
158 | #endif | 158 | #endif |
159 | memio_err = csr_in32(IOADDR(A_BUS_MEM_IO_ERRORS)); | 159 | memio_err = csr_in32(IOADDR(A_BUS_MEM_IO_ERRORS)); |
160 | printk("Bus watcher error counters: %08x %08x\n", l2_err, memio_err); | 160 | printk("Bus watcher error counters: %08x %08x\n", l2_err, memio_err); |
@@ -183,9 +183,9 @@ asmlinkage void sb1_cache_error(void) | |||
183 | #ifdef CONFIG_SIBYTE_BW_TRACE | 183 | #ifdef CONFIG_SIBYTE_BW_TRACE |
184 | /* Freeze the trace buffer now */ | 184 | /* Freeze the trace buffer now */ |
185 | #if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80) | 185 | #if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80) |
186 | csr_out32(M_BCM1480_SCD_TRACE_CFG_FREEZE, IO_SPACE_BASE | A_SCD_TRACE_CFG); | 186 | csr_out32(M_BCM1480_SCD_TRACE_CFG_FREEZE, IOADDR(A_SCD_TRACE_CFG)); |
187 | #else | 187 | #else |
188 | csr_out32(M_SCD_TRACE_CFG_FREEZE, IO_SPACE_BASE | A_SCD_TRACE_CFG); | 188 | csr_out32(M_SCD_TRACE_CFG_FREEZE, IOADDR(A_SCD_TRACE_CFG)); |
189 | #endif | 189 | #endif |
190 | printk("Trace buffer frozen\n"); | 190 | printk("Trace buffer frozen\n"); |
191 | #endif | 191 | #endif |