Skip to content

Commit

Permalink
[S390] Fix section annotations.
Browse files Browse the repository at this point in the history
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: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  • Loading branch information
Heiko Carstens authored and Martin Schwidefsky committed May 31, 2007
1 parent d330f93 commit ea1f4ee
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions arch/s390/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions arch/s390/kernel/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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);

Expand All @@ -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;
}
Expand Down

0 comments on commit ea1f4ee

Please sign in to comment.