Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea1f4eec authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[S390] Fix section annotations. 



Use the __cpuinit instead of __devinit section annotations for code
that deals with cpu hotplug. In addition add some more annotations on
functions that have been left out so far.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent d330f935

arch/s390/kernel/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static struct resource data_resource = { 
/*

 * cpu_init() initializes state that is per-CPU.

 */

void __devinit cpu_init (void)

void __cpuinit cpu_init(void)

{

        int addr = hard_smp_processor_id();
@@ -915,7 +915,7 @@ setup_arch(char **cmdline_p) 
	setup_zfcpdump(console_devno);

}



void print_cpu_info(struct cpuinfo_S390 *cpuinfo)

void __cpuinit print_cpu_info(struct cpuinfo_S390 *cpuinfo)

{

   printk("cpu %d "

#ifdef CONFIG_SMP

arch/s390/kernel/smp.c

+3 −3
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ static unsigned int __init smp_count_cpus(void) 
/*

 *	Activate a secondary processor.

 */

int __devinit start_secondary(void *cpuvoid)

int __cpuinit start_secondary(void *cpuvoid)

{

	/* Setup the cpu */

	cpu_init();
@@ -741,7 +741,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus) 
			smp_create_idle(cpu);

}



void __devinit smp_prepare_boot_cpu(void)

void __init smp_prepare_boot_cpu(void)

{

	BUG_ON(smp_processor_id() != 0);
@@ -750,7 +750,7 @@ void __devinit smp_prepare_boot_cpu(void) 
	current_set[0] = current;

}



void smp_cpus_done(unsigned int max_cpus)

void __init smp_cpus_done(unsigned int max_cpus)

{

	cpu_present_map = cpu_possible_map;

}