Patchwork powerpc: Define cpus_in_crash only for SMP kernels

login
register
mail settings
Submitter Paul E. McKenney
Date Feb. 1, 2012, 6:55 p.m.
Message ID <20120201185510.GA8542@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/138964/
State Not Applicable
Headers show

Comments

Paul E. McKenney - Feb. 1, 2012, 6:55 p.m.
The variable cpus_in_crash gets a defined-but-not-used warning when
CONFIG_SMP=n, so fix by placing the variable under ifdef.

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Paul Gortmaker - Feb. 1, 2012, 8:28 p.m.
On 12-02-01 01:55 PM, Paul E. McKenney wrote:
> The variable cpus_in_crash gets a defined-but-not-used warning when
> CONFIG_SMP=n, so fix by placing the variable under ifdef.

I think Ben already merged a similar fix.

http://patchwork.ozlabs.org/patch/136549/

P.

> 
> Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
> 
> diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
> index 28be345..eb3384e 100644
> --- a/arch/powerpc/kernel/crash.c
> +++ b/arch/powerpc/kernel/crash.c
> @@ -46,7 +46,9 @@
>  
>  /* This keeps a track of which one is the crashing cpu. */
>  int crashing_cpu = -1;
> +#ifdef CONFIG_SMP
>  static atomic_t cpus_in_crash;
> +#endif /* #ifdef CONFIG_SMP */
>  static int time_to_dump;
>  
>  #define CRASH_HANDLER_MAX 3
>
Paul E. McKenney - Feb. 1, 2012, 11:15 p.m.
On Wed, Feb 01, 2012 at 03:28:34PM -0500, Paul Gortmaker wrote:
> On 12-02-01 01:55 PM, Paul E. McKenney wrote:
> > The variable cpus_in_crash gets a defined-but-not-used warning when
> > CONFIG_SMP=n, so fix by placing the variable under ifdef.
> 
> I think Ben already merged a similar fix.
> 
> http://patchwork.ozlabs.org/patch/136549/
> 
> P.

Linus's tree does now have cpus_in_crash, so agreed.  Sorry for the
noise!

							Thanx, Paul

> > Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
> > 
> > diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
> > index 28be345..eb3384e 100644
> > --- a/arch/powerpc/kernel/crash.c
> > +++ b/arch/powerpc/kernel/crash.c
> > @@ -46,7 +46,9 @@
> >  
> >  /* This keeps a track of which one is the crashing cpu. */
> >  int crashing_cpu = -1;
> > +#ifdef CONFIG_SMP
> >  static atomic_t cpus_in_crash;
> > +#endif /* #ifdef CONFIG_SMP */
> >  static int time_to_dump;
> >  
> >  #define CRASH_HANDLER_MAX 3
> > 
>

Patch

diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
index 28be345..eb3384e 100644
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -46,7 +46,9 @@ 
 
 /* This keeps a track of which one is the crashing cpu. */
 int crashing_cpu = -1;
+#ifdef CONFIG_SMP
 static atomic_t cpus_in_crash;
+#endif /* #ifdef CONFIG_SMP */
 static int time_to_dump;
 
 #define CRASH_HANDLER_MAX 3