On Tue, Mar 09, 2010 at 08:03:09PM +0100, Ralf Baechle wrote: > > @@ -281,7 +281,7 @@ static void octeon_cpu_die(unsigned int cpu) > > > > #ifdef CONFIG_CAVIUM_OCTEON_WATCHDOG > > /* Disable the watchdog */ > > - cvmx_ciu_wdogx_t ciu_wdog; > > + union cvmx_ciu_wdogx 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); > > David, > > I think this ifdef should be replaced by a notifier called from > __cpu_die(). Since this is unused I'll just remove it for now. Ralf
