* [PATCH] MIPS: Octeon: Fix wrong variable type in smp.c
@ 2010-03-09 6:24 Yang Shi
2010-03-09 19:03 ` Ralf Baechle
0 siblings, 1 reply; 4+ messages in thread
From: Yang Shi @ 2010-03-09 6:24 UTC (permalink / raw)
To: ddaney, ralf; +Cc: linux-mips
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);
--
1.6.3.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] MIPS: Octeon: Fix wrong variable type in smp.c
2010-03-09 6:24 [PATCH] MIPS: Octeon: Fix wrong variable type in smp.c Yang Shi
@ 2010-03-09 19:03 ` Ralf Baechle
2010-03-09 19:17 ` Ralf Baechle
0 siblings, 1 reply; 4+ messages in thread
From: Ralf Baechle @ 2010-03-09 19:03 UTC (permalink / raw)
To: Yang Shi; +Cc: ddaney, linux-mips
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] MIPS: Octeon: Fix wrong variable type in smp.c
2010-03-09 19:03 ` Ralf Baechle
@ 2010-03-09 19:17 ` Ralf Baechle
2010-03-11 2:53 ` Yang Shi
0 siblings, 1 reply; 4+ messages in thread
From: Ralf Baechle @ 2010-03-09 19:17 UTC (permalink / raw)
To: Yang Shi; +Cc: ddaney, linux-mips
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] MIPS: Octeon: Fix wrong variable type in smp.c
2010-03-09 19:17 ` Ralf Baechle
@ 2010-03-11 2:53 ` Yang Shi
0 siblings, 0 replies; 4+ messages in thread
From: Yang Shi @ 2010-03-11 2:53 UTC (permalink / raw)
To: Ralf Baechle; +Cc: ddaney, linux-mips
Ralf Baechle 写道:
> 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.
>
This breaks kernel build when HOTPLUG_CPU is enabled.
Regards,
Yang
> Ralf
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-03-11 2:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-09 6:24 [PATCH] MIPS: Octeon: Fix wrong variable type in smp.c Yang Shi
2010-03-09 19:03 ` Ralf Baechle
2010-03-09 19:17 ` Ralf Baechle
2010-03-11 2:53 ` Yang Shi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.