projects
/
platform
/
kernel
/
linux-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c948aca
)
MIPS: Cavium: Remove unused watchdog code.
author
Ralf Baechle
<ralf@linux-mips.org>
Tue, 9 Mar 2010 19:16:15 +0000
(20:16 +0100)
committer
Ralf Baechle
<ralf@linux-mips.org>
Mon, 12 Apr 2010 16:26:08 +0000
(17:26 +0100)
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/cavium-octeon/smp.c
patch
|
blob
|
history
diff --git
a/arch/mips/cavium-octeon/smp.c
b/arch/mips/cavium-octeon/smp.c
index
51e9802
..
6d99b9d
100644
(file)
--- a/
arch/mips/cavium-octeon/smp.c
+++ b/
arch/mips/cavium-octeon/smp.c
@@
-279,14
+279,6
@@
static void octeon_cpu_die(unsigned int cpu)
uint32_t avail_coremask;
struct cvmx_bootmem_named_block_desc *block_desc;
-#ifdef CONFIG_CAVIUM_OCTEON_WATCHDOG
- /* Disable the watchdog */
- cvmx_ciu_wdogx_t ciu_wdog;
- ciu_wdog.u64 = cvmx_read_csr(CVMX_CIU_WDOGX(cpu));
- ciu_wdog.s.mode = 0;
- cvmx_write_csr(CVMX_CIU_WDOGX(cpu), ciu_wdog.u64);
-#endif
-
while (per_cpu(cpu_state, cpu) != CPU_DEAD)
cpu_relax();