Commit bd6f68af authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[PATCH] ARM SMP: Mark CPU init functions/data with __cpuinit/...data 



Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 772a9e63

arch/arm/kernel/smp.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -78,7 +78,7 @@ struct smp_call_struct { 
static struct smp_call_struct * volatile smp_call_function_data;

static struct smp_call_struct * volatile smp_call_function_data;

static DEFINE_SPINLOCK(smp_call_function_lock);

static DEFINE_SPINLOCK(smp_call_function_lock);





int __init __cpu_up(unsigned int cpu)

int __cpuinit __cpu_up(unsigned int cpu)

{

{

	struct task_struct *idle;

	struct task_struct *idle;

	pgd_t *pgd;

	pgd_t *pgd;
@@ -159,7 +159,7 @@ int __init __cpu_up(unsigned int cpu) 
 * This is the secondary CPU boot entry.  We're using this CPUs

 * This is the secondary CPU boot entry.  We're using this CPUs

 * idle thread stack, but a set of temporary page tables.

 * idle thread stack, but a set of temporary page tables.

 */

 */

asmlinkage void __init secondary_start_kernel(void)

asmlinkage void __cpuinit secondary_start_kernel(void)

{

{

	struct mm_struct *mm = &init_mm;

	struct mm_struct *mm = &init_mm;

	unsigned int cpu = smp_processor_id();

	unsigned int cpu = smp_processor_id();
@@ -209,7 +209,7 @@ asmlinkage void __init secondary_start_kernel(void) 
 * Called by both boot and secondaries to move global data into

 * Called by both boot and secondaries to move global data into

 * per-processor storage.

 * per-processor storage.

 */

 */

void __init smp_store_cpu_info(unsigned int cpuid)

void __cpuinit smp_store_cpu_info(unsigned int cpuid)

{

{

	struct cpuinfo_arm *cpu_info = &per_cpu(cpu_data, cpuid);

	struct cpuinfo_arm *cpu_info = &per_cpu(cpu_data, cpuid);

arch/arm/mach-integrator/platsmp.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ unsigned long __initdata phys_pen_release = 0; 




static DEFINE_SPINLOCK(boot_lock);

static DEFINE_SPINLOCK(boot_lock);





void __init platform_secondary_init(unsigned int cpu)

void __cpuinit platform_secondary_init(unsigned int cpu)

{

{

	/*

	/*

	 * the primary core may have used a "cross call" soft interrupt

	 * the primary core may have used a "cross call" soft interrupt
@@ -61,7 +61,7 @@ void __init platform_secondary_init(unsigned int cpu) 
	spin_unlock(&boot_lock);

	spin_unlock(&boot_lock);

}

}





int __init boot_secondary(unsigned int cpu, struct task_struct *idle)

int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)

{

{

	unsigned long timeout;

	unsigned long timeout;