Re: [PATCH] MIPS: Octeon: Fix wrong variable type in smp.c

[Ralf Baechle <ralf@linux-mips.org>]

On Tue, Mar 09, 2010 at 02:24:22PM +0800, Yang Shi wrote:

> Change cvmx_ciu_wdogx_t type to "union cvmx_ciu_wdogx".
> 
> Signed-off-by: Yang Shi <yang.shi@windriver.com>
> ---
>  arch/mips/cavium-octeon/smp.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c
> index 51e9802..52d61ba 100644
> --- a/arch/mips/cavium-octeon/smp.c
> +++ b/arch/mips/cavium-octeon/smp.c
> @@ -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().

  Ralf