Skip to contentSkip to conversation

x86: smpboot - wakeup_secondary should be done via __cpuinit section

PATCH In review Cyrill Gorcunov 2 participants 5 messages Apr 18, 2009 – Apr 19, 2009 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: smpboot - wakeup_secondary should be done via __cpuinit section

A caller (do_boot_cpu) already has __cpuinit attribute.

Since HOTPLUG_CPU depends on SMP && HOTPLUG it doesn't lead to panic at moment.

[ Impact: cleanup ]

---
 arch/x86/kernel/smpboot.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/smpboot.c +2 -2
Index: linux-2.6.git/arch/x86/kernel/smpboot.c
=====================================================================
@@ -504,7 +504,7 @@ void __inquire_remote_apic(int apicid)
  * INIT, INIT, STARTUP sequence will reset the chip hard for us, and this
  * won't ... remember to clear down the APIC, etc later.
  */
-int __devinit
+int __cpuinit
 wakeup_secondary_cpu_via_nmi(int logical_apicid, unsigned long start_eip)
 {
 	unsigned long send_status, accept_status = 0;
@@ -538,7 +538,7 @@ wakeup_secondary_cpu_via_nmi(int logical
 	return (send_status | accept_status);
 }
 
-static int __devinit
+static int __cpuinit
 wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip)
 {
 	unsigned long send_status, accept_status = 0;
#1 lore raw
Commit-ID:  1f51f72326c4d16f402bdfed99c8dae20eb67863
Gitweb:     http://git.kernel.org/tip/1f51f72326c4d16f402bdfed99c8dae20eb67863
Author:     Cyrill Gorcunov <[email protected]>
AuthorDate: Sat, 18 Apr 2009 23:45:28 +0400
Committer:  Ingo Molnar <[email protected]>
CommitDate: Sat, 18 Apr 2009 22:58:58 +0200

x86: smpboot - wakeup_secondary should be done via __cpuinit section

A caller (do_boot_cpu) already has __cpuinit attribute.

Since HOTPLUG_CPU depends on SMP && HOTPLUG it doesn't lead to panic at moment.

[ Impact: cleanup ]

LKML-Reference: <20090418194528.GD25510@lenovo>

---
 arch/x86/kernel/smpboot.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/smpboot.c +2 -2
index bf8ad63..d2e8de9 100644
@@ -504,7 +504,7 @@ void __inquire_remote_apic(int apicid)
  * INIT, INIT, STARTUP sequence will reset the chip hard for us, and this
  * won't ... remember to clear down the APIC, etc later.
  */
-int __devinit
+int __cpuinit
 wakeup_secondary_cpu_via_nmi(int logical_apicid, unsigned long start_eip)
 {
 	unsigned long send_status, accept_status = 0;
@@ -538,7 +538,7 @@ wakeup_secondary_cpu_via_nmi(int logical_apicid, unsigned long start_eip)
 	return (send_status | accept_status);
 }
 
-static int __devinit
+static int __cpuinit
 wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip)
 {
 	unsigned long send_status, accept_status = 0;
#2 lore raw
Quoted 16 lines · tip-bot for Cyrill Gorcunov
Commit-ID:  1f51f72326c4d16f402bdfed99c8dae20eb67863
Gitweb:     http://git.kernel.org/tip/1f51f72326c4d16f402bdfed99c8dae20eb67863
Author:     Cyrill Gorcunov <[email protected]>
AuthorDate: Sat, 18 Apr 2009 23:45:28 +0400
Committer:  Ingo Molnar <[email protected]>
CommitDate: Sat, 18 Apr 2009 22:58:58 +0200

x86: smpboot - wakeup_secondary should be done via __cpuinit section

A caller (do_boot_cpu) already has __cpuinit attribute.

Since HOTPLUG_CPU depends on SMP && HOTPLUG it doesn't lead to panic at moment.

[ Impact: cleanup ]

Quoted 7 lines

LKML-Reference: <20090418194528.GD25510@lenovo>

---
 arch/x86/kernel/smpboot.c |    4 ++--

there are other two in numaq and es7000.

can you fix them too?

YH

#3 lore raw
Quoted 23 lines · Yinghai Lu
Quoted 22 lines · tip-bot for Cyrill Gorcunov

Commit-ID: 1f51f72326c4d16f402bdfed99c8dae20eb67863 Gitweb:
http://git.kernel.org/tip/1f51f72326c4d16f402bdfed99c8dae20eb67863

Author:     Cyrill Gorcunov <[email protected]>
AuthorDate: Sat, 18 Apr 2009 23:45:28 +0400
Committer:  Ingo Molnar <[email protected]>
CommitDate: Sat, 18 Apr 2009 22:58:58 +0200

x86: smpboot - wakeup_secondary should be done via __cpuinit section

A caller (do_boot_cpu) already has __cpuinit attribute.

Since HOTPLUG_CPU depends on SMP && HOTPLUG it doesn't lead to panic at moment.

[ Impact: cleanup ]

LKML-Reference: <20090418194528.GD25510@lenovo>

Quoted 10 lines
Quoted 2 lines
---
 arch/x86/kernel/smpboot.c |    4 ++--

there are other two in numaq and es7000.

can you fix them too?

YH

Will do tomorrow morning

#4 lore raw
In reply to Cyrill Gorcunov
Commit-ID:  cece3155d869a50ba534ed161b5a05e8a29dcad0
Gitweb:     http://git.kernel.org/tip/cece3155d869a50ba534ed161b5a05e8a29dcad0
Author:     Cyrill Gorcunov <[email protected]>
AuthorDate: Sat, 18 Apr 2009 23:45:28 +0400
Committer:  Ingo Molnar <[email protected]>
CommitDate: Sun, 19 Apr 2009 10:22:14 +0200

x86: smpboot - wakeup_secondary should be done via __cpuinit section

A caller (do_boot_cpu) already has __cpuinit attribute.

Since HOTPLUG_CPU depends on SMP && HOTPLUG it doesn't lead to panic at moment.

[ Impact: cleanup ]

LKML-Reference: <20090418194528.GD25510@lenovo>

---
 arch/x86/kernel/smpboot.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/smpboot.c +2 -2
index bf8ad63..d2e8de9 100644
@@ -504,7 +504,7 @@ void __inquire_remote_apic(int apicid)
  * INIT, INIT, STARTUP sequence will reset the chip hard for us, and this
  * won't ... remember to clear down the APIC, etc later.
  */
-int __devinit
+int __cpuinit
 wakeup_secondary_cpu_via_nmi(int logical_apicid, unsigned long start_eip)
 {
 	unsigned long send_status, accept_status = 0;
@@ -538,7 +538,7 @@ wakeup_secondary_cpu_via_nmi(int logical_apicid, unsigned long start_eip)
 	return (send_status | accept_status);
 }
 
-static int __devinit
+static int __cpuinit
 wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip)
 {
 	unsigned long send_status, accept_status = 0;