summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2010-03-09 20:16:15 +0100
committerRalf Baechle <ralf@linux-mips.org>2010-04-12 17:26:08 +0100
commit1874a0886076fbb26665f93a8999c05e389bae22 (patch)
tree850b47fd33c929ad0b60f7e7fe865cc0c44a7b2b
parentc948aca4f49d94b08c425f65acdaca1d679d6fa7 (diff)
downloadlinux-1874a0886076fbb26665f93a8999c05e389bae22.tar.gz
linux-1874a0886076fbb26665f93a8999c05e389bae22.tar.bz2
linux-1874a0886076fbb26665f93a8999c05e389bae22.zip
MIPS: Cavium: Remove unused watchdog code.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/cavium-octeon/smp.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c
index 51e980290ce1..6d99b9d8887d 100644
--- 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();