Skip to contentSkip to conversation

x86, acpi: temp_stack is used only when CONFIG_SMP is set

PATCH Applied Marcin Slusarz 4 participants 6 messages Aug 3, 2008 – Aug 15, 2008

Subsystems (3)
x86 ACPI Suspend to RAM
lore
Share & tools
lore

Marcin Slusarz

author
#0 lore raw

PATCH 1/1 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(-)
arch/x86/kernel/acpi/sleep.c +1 -1
index fa2161d..9103cb6 100644
@@ -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
Signature · 1 line
1.5.4.5
#1 lore raw
Quoted 15 lines · Marcin Slusarz

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(-)
arch/x86/kernel/acpi/sleep.c +0 -0
index fa2161d..9103cb6 100644

arch/x86/kernel/acpi/sleep.c unsigned long acpi_realmode_flags; · line 26

Quoted 8 lines
arch/x86/kernel/acpi/sleep.c +1 -1
@@ -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

author
#2 lore raw
Quoted 20 lines · Sven Wegener
Quoted 18 lines · Marcin Slusarz

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(-)
arch/x86/kernel/acpi/sleep.c +0 -0
index fa2161d..9103cb6 100644
@@ -20,7 +20,7 @@ unsigned long acpi_realmode_flags;
 /* address in low memory of the wakeup routine. */
 static unsigned long acpi_realmode;
Quoted 9 lines

arch/x86/kernel/acpi/sleep.c unsigned long acpi_realmode_flags; · line 26

Quoted 5 lines
arch/x86/kernel/acpi/sleep.c +1 -1
-#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!

---

Quoted 1 line

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(-)
arch/x86/kernel/acpi/sleep.c +1 -1
index fa2161d..81e5ab6 100644
@@ -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
Signature · 1 line
1.5.4.5
Acked-by
#3 lore raw

Hi!

Quoted 35 lines
Quoted 18 lines
Quoted 18 lines

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(-)
arch/x86/kernel/acpi/sleep.c +0 -0
index fa2161d..9103cb6 100644
@@ -20,7 +20,7 @@ unsigned long acpi_realmode_flags;
 /* address in low memory of the wakeup routine. */
 static unsigned long acpi_realmode;
Quoted 9 lines

arch/x86/kernel/acpi/sleep.c unsigned long acpi_realmode_flags; · line 26

Quoted 5 lines
arch/x86/kernel/acpi/sleep.c +1 -1
-#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

Quoted 4 lines

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

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
author
#4 lore raw
Quoted 37 lines · Pavel Machek

Hi!

Quoted 35 lines
Quoted 18 lines
Quoted 18 lines

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(-)
arch/x86/kernel/acpi/sleep.c +0 -0
index fa2161d..9103cb6 100644
@@ -20,7 +20,7 @@ unsigned long acpi_realmode_flags;
 /* address in low memory of the wakeup routine. */
 static unsigned long acpi_realmode;
Quoted 9 lines

arch/x86/kernel/acpi/sleep.c unsigned long acpi_realmode_flags; · line 26

Quoted 5 lines
arch/x86/kernel/acpi/sleep.c +1 -1
-#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

Quoted 8 lines
Quoted 4 lines

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

Applied
#5 lore raw
In reply to Pavel Machek
Quoted 9 lines · Pavel Machek
Quoted 5 lines
Quoted 3 lines

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