2008-08-03 16:52:57

by Marcin Slusarz

Subject: [PATCH] x86, acpi: temp_stack is used only when CONFIG_SMP is set

arch/x86/kernel/acpi/sleep.c:24: warning: 'temp_stack' defined but not used

Signed-off-by: Marcin Slusarz <[email protected]>
Cc: Glauber Costa <[email protected]>
Cc: Pavel Machek <[email protected]>
Cc: Ingo Molnar <[email protected]>
---
arch/x86/kernel/acpi/sleep.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
index fa2161d..9103cb6 100644
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@ -20,7 +20,7 @@ unsigned long acpi_realmode_flags;
/* address in low memory of the wakeup routine. */
static unsigned long acpi_realmode;

-#ifdef CONFIG_64BIT
+#ifdef CONFIG_SMP
static char temp_stack[10240];
#endif

--
1.5.4.5

2008-08-03 17:07:54

by Sven Wegener

Subject: Re: [PATCH] x86, acpi: temp_stack is used only when CONFIG_SMP is set

On Sun, 3 Aug 2008, Marcin Slusarz wrote:

> arch/x86/kernel/acpi/sleep.c:24: warning: 'temp_stack' defined but not used
>
> Signed-off-by: Marcin Slusarz <[email protected]>
> Cc: Glauber Costa <[email protected]>
> Cc: Pavel Machek <[email protected]>
> Cc: Ingo Molnar <[email protected]>
> ---
> arch/x86/kernel/acpi/sleep.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
> index fa2161d..9103cb6 100644
> --- a/arch/x86/kernel/acpi/sleep.c
> +++ b/arch/x86/kernel/acpi/sleep.c
> @@ -20,7 +20,7 @@ unsigned long acpi_realmode_flags;
> /* address in low memory of the wakeup routine. */
> static unsigned long acpi_realmode;
>
> -#ifdef CONFIG_64BIT
> +#ifdef CONFIG_SMP
> static char temp_stack[10240];
> #endif
>

Now it still generates the warning, but on i386 with CONFIG_SMP set,
instead of x86_64 without CONFIG_SMP. We only need temp_stack, when both
CONFIG_64BIT and CONFIG_SMP are activated.

Sven

2008-08-03 17:26:35

by Marcin Slusarz

Subject: Re: [PATCH] x86, acpi: temp_stack is used only when CONFIG_SMP is set

On Sun, Aug 03, 2008 at 07:07:30PM +0200, Sven Wegener wrote:
> On Sun, 3 Aug 2008, Marcin Slusarz wrote:
>
> > arch/x86/kernel/acpi/sleep.c:24: warning: 'temp_stack' defined but not used
> >
> > Signed-off-by: Marcin Slusarz <[email protected]>
> > Cc: Glauber Costa <[email protected]>
> > Cc: Pavel Machek <[email protected]>
> > Cc: Ingo Molnar <[email protected]>
> > ---
> > arch/x86/kernel/acpi/sleep.c | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
> > index fa2161d..9103cb6 100644
> > --- a/arch/x86/kernel/acpi/sleep.c
> > +++ b/arch/x86/kernel/acpi/sleep.c
> > @@ -20,7 +20,7 @@ unsigned long acpi_realmode_flags;
> > /* address in low memory of the wakeup routine. */
> > static unsigned long acpi_realmode;
> >
> > -#ifdef CONFIG_64BIT
> > +#ifdef CONFIG_SMP
> > static char temp_stack[10240];
> > #endif
> >
>
> Now it still generates the warning, but on i386 with CONFIG_SMP set,
> instead of x86_64 without CONFIG_SMP. We only need temp_stack, when both
> CONFIG_64BIT and CONFIG_SMP are activated.

Yes. Thanks for looking at the patch!

---
>From c6e673acf02e8bf04866cadf17c1cb1fa4d852ea Mon Sep 17 00:00:00 2001
From: Marcin Slusarz <[email protected]>
Subject: [PATCH] x86, acpi: temp_stack is used only when CONFIG_64BIT && CONFIG_SMP is set

arch/x86/kernel/acpi/sleep.c:24: warning: 'temp_stack' defined but not used

Signed-off-by: Marcin Slusarz <[email protected]>
Cc: Glauber Costa <[email protected]>
Cc: Pavel Machek <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Sven Wegener <[email protected]>
---
arch/x86/kernel/acpi/sleep.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
index fa2161d..81e5ab6 100644
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@ -20,7 +20,7 @@ unsigned long acpi_realmode_flags;
/* address in low memory of the wakeup routine. */
static unsigned long acpi_realmode;

-#ifdef CONFIG_64BIT
+#if defined(CONFIG_SMP) && defined(CONFIG_64BIT)
static char temp_stack[10240];
#endif

--
1.5.4.5

2008-08-07 21:23:34

by Pavel Machek

Subject: Re: [PATCH] x86, acpi: temp_stack is used only when CONFIG_SMP is set

Hi!

> > > arch/x86/kernel/acpi/sleep.c:24: warning: 'temp_stack' defined but not used
> > >
> > > Signed-off-by: Marcin Slusarz <[email protected]>
> > > Cc: Glauber Costa <[email protected]>
> > > Cc: Pavel Machek <[email protected]>
> > > Cc: Ingo Molnar <[email protected]>
> > > ---
> > > arch/x86/kernel/acpi/sleep.c | 2 +-
> > > 1 files changed, 1 insertions(+), 1 deletions(-)
> > >
> > > diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
> > > index fa2161d..9103cb6 100644
> > > --- a/arch/x86/kernel/acpi/sleep.c
> > > +++ b/arch/x86/kernel/acpi/sleep.c
> > > @@ -20,7 +20,7 @@ unsigned long acpi_realmode_flags;
> > > /* address in low memory of the wakeup routine. */
> > > static unsigned long acpi_realmode;
> > >
> > > -#ifdef CONFIG_64BIT
> > > +#ifdef CONFIG_SMP
> > > static char temp_stack[10240];
> > > #endif
> > >
> >
> > Now it still generates the warning, but on i386 with CONFIG_SMP set,
> > instead of x86_64 without CONFIG_SMP. We only need temp_stack, when both
> > CONFIG_64BIT and CONFIG_SMP are activated.
>
> Yes. Thanks for looking at the patch!
>
> ---
> From c6e673acf02e8bf04866cadf17c1cb1fa4d852ea Mon Sep 17 00:00:00 2001
> From: Marcin Slusarz <[email protected]>
> Subject: [PATCH] x86, acpi: temp_stack is used only when CONFIG_64BIT && CONFIG_SMP is set
>
> arch/x86/kernel/acpi/sleep.c:24: warning: 'temp_stack' defined but not used
>
> Signed-off-by: Marcin Slusarz <[email protected]>
> Cc: Glauber Costa <[email protected]>

Acked-by: Pavel Machek <[email protected]>

Ingo, can you merge this one?

Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

2008-08-15 12:13:04

by Marcin Slusarz

Subject: Re: [PATCH] x86, acpi: temp_stack is used only when CONFIG_SMP is set

On Thu, Aug 07, 2008 at 10:12:46AM +0200, Pavel Machek wrote:
> Hi!
>
> > > > arch/x86/kernel/acpi/sleep.c:24: warning: 'temp_stack' defined but not used
> > > >
> > > > Signed-off-by: Marcin Slusarz <[email protected]>
> > > > Cc: Glauber Costa <[email protected]>
> > > > Cc: Pavel Machek <[email protected]>
> > > > Cc: Ingo Molnar <[email protected]>
> > > > ---
> > > > arch/x86/kernel/acpi/sleep.c | 2 +-
> > > > 1 files changed, 1 insertions(+), 1 deletions(-)
> > > >
> > > > diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
> > > > index fa2161d..9103cb6 100644
> > > > --- a/arch/x86/kernel/acpi/sleep.c
> > > > +++ b/arch/x86/kernel/acpi/sleep.c
> > > > @@ -20,7 +20,7 @@ unsigned long acpi_realmode_flags;
> > > > /* address in low memory of the wakeup routine. */
> > > > static unsigned long acpi_realmode;
> > > >
> > > > -#ifdef CONFIG_64BIT
> > > > +#ifdef CONFIG_SMP
> > > > static char temp_stack[10240];
> > > > #endif
> > > >
> > >
> > > Now it still generates the warning, but on i386 with CONFIG_SMP set,
> > > instead of x86_64 without CONFIG_SMP. We only need temp_stack, when both
> > > CONFIG_64BIT and CONFIG_SMP are activated.
> >
> > Yes. Thanks for looking at the patch!
> >
> > ---
> > From c6e673acf02e8bf04866cadf17c1cb1fa4d852ea Mon Sep 17 00:00:00 2001
> > From: Marcin Slusarz <[email protected]>
> > Subject: [PATCH] x86, acpi: temp_stack is used only when CONFIG_64BIT && CONFIG_SMP is set
> >
> > arch/x86/kernel/acpi/sleep.c:24: warning: 'temp_stack' defined but not used
> >
> > Signed-off-by: Marcin Slusarz <[email protected]>
> > Cc: Glauber Costa <[email protected]>
>
> Acked-by: Pavel Machek <[email protected]>
>
> Ingo, can you merge this one?

Should I resend this patch? Or is there anything wrong with second version?

Marcin

2008-08-15 14:41:44

by Ingo Molnar

Subject: Re: [PATCH] x86, acpi: temp_stack is used only when CONFIG_SMP is set

* Pavel Machek <[email protected]> wrote:

> > > Now it still generates the warning, but on i386 with CONFIG_SMP set,
> > > instead of x86_64 without CONFIG_SMP. We only need temp_stack, when both
> > > CONFIG_64BIT and CONFIG_SMP are activated.
> >
> > Yes. Thanks for looking at the patch!

> Acked-by: Pavel Machek <[email protected]>
>
> Ingo, can you merge this one?

applied to tip/x86/urgent - thanks.

Ingo