|
@@ -159,7 +159,7 @@ void __init smp_alloc_memory(void)
|
|
|
* a given CPU
|
|
|
*/
|
|
|
|
|
|
-static void __devinit smp_store_cpu_info(int id)
|
|
|
+static void __cpuinit smp_store_cpu_info(int id)
|
|
|
{
|
|
|
struct cpuinfo_x86 *c = cpu_data + id;
|
|
|
|
|
@@ -364,7 +364,7 @@ extern void calibrate_delay(void);
|
|
|
|
|
|
static atomic_t init_deasserted;
|
|
|
|
|
|
-static void __devinit smp_callin(void)
|
|
|
+static void __cpuinit smp_callin(void)
|
|
|
{
|
|
|
int cpuid, phys_id;
|
|
|
unsigned long timeout;
|
|
@@ -538,7 +538,7 @@ set_cpu_sibling_map(int cpu)
|
|
|
/*
|
|
|
* Activate a secondary processor.
|
|
|
*/
|
|
|
-static void __devinit start_secondary(void *unused)
|
|
|
+static void __cpuinit start_secondary(void *unused)
|
|
|
{
|
|
|
/*
|
|
|
* Don't put *anything* before secondary_cpu_init(), SMP
|
|
@@ -931,7 +931,7 @@ static inline struct task_struct * alloc_idle_task(int cpu)
|
|
|
#define alloc_idle_task(cpu) fork_idle(cpu)
|
|
|
#endif
|
|
|
|
|
|
-static int __devinit do_boot_cpu(int apicid, int cpu)
|
|
|
+static int __cpuinit do_boot_cpu(int apicid, int cpu)
|
|
|
/*
|
|
|
* NOTE - on most systems this is a PHYSICAL apic ID, but on multiquad
|
|
|
* (ie clustered apic addressing mode), this is a LOGICAL apic ID.
|
|
@@ -1432,7 +1432,7 @@ void __cpu_die(unsigned int cpu)
|
|
|
}
|
|
|
#endif /* CONFIG_HOTPLUG_CPU */
|
|
|
|
|
|
-int __devinit __cpu_up(unsigned int cpu)
|
|
|
+int __cpuinit __cpu_up(unsigned int cpu)
|
|
|
{
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
|
int ret=0;
|