From 2f7167939834295558fac633bcaad5cce420a47e Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 9 Mar 2010 20:16:15 +0100
Subject: [PATCH] --- yaml --- r: 189761 b: refs/heads/master c:
 1874a0886076fbb26665f93a8999c05e389bae22 h: refs/heads/master i:   189759:
 2bb87322831c435d3a8bc5817fbfaa60ab827700 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/mips/cavium-octeon/smp.c | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 7a2216230723..9a561a7c7168 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c948aca4f49d94b08c425f65acdaca1d679d6fa7
+refs/heads/master: 1874a0886076fbb26665f93a8999c05e389bae22
diff --git a/trunk/arch/mips/cavium-octeon/smp.c b/trunk/arch/mips/cavium-octeon/smp.c
index 51e980290ce1..6d99b9d8887d 100644
--- a/trunk/arch/mips/cavium-octeon/smp.c
+++ b/trunk/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();