diff options
Diffstat (limited to 'arch/s390/kernel/smp.c')
-rw-r--r-- | arch/s390/kernel/smp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index bb3d34aa7b85..1f4711b60aab 100644 --- a/arch/s390/kernel/smp.c +++ b/arch/s390/kernel/smp.c | |||
@@ -508,7 +508,6 @@ out: | |||
508 | return -ENOMEM; | 508 | return -ENOMEM; |
509 | } | 509 | } |
510 | 510 | ||
511 | #ifdef CONFIG_HOTPLUG_CPU | ||
512 | static void smp_free_lowcore(int cpu) | 511 | static void smp_free_lowcore(int cpu) |
513 | { | 512 | { |
514 | struct _lowcore *lowcore; | 513 | struct _lowcore *lowcore; |
@@ -527,7 +526,6 @@ static void smp_free_lowcore(int cpu) | |||
527 | free_pages((unsigned long) lowcore, lc_order); | 526 | free_pages((unsigned long) lowcore, lc_order); |
528 | lowcore_ptr[cpu] = NULL; | 527 | lowcore_ptr[cpu] = NULL; |
529 | } | 528 | } |
530 | #endif /* CONFIG_HOTPLUG_CPU */ | ||
531 | 529 | ||
532 | /* Upping and downing of CPUs */ | 530 | /* Upping and downing of CPUs */ |
533 | int __cpuinit __cpu_up(unsigned int cpu) | 531 | int __cpuinit __cpu_up(unsigned int cpu) |
@@ -544,8 +542,10 @@ int __cpuinit __cpu_up(unsigned int cpu) | |||
544 | 542 | ||
545 | ccode = signal_processor_p((__u32)(unsigned long)(lowcore_ptr[cpu]), | 543 | ccode = signal_processor_p((__u32)(unsigned long)(lowcore_ptr[cpu]), |
546 | cpu, sigp_set_prefix); | 544 | cpu, sigp_set_prefix); |
547 | if (ccode) | 545 | if (ccode) { |
546 | smp_free_lowcore(cpu); | ||
548 | return -EIO; | 547 | return -EIO; |
548 | } | ||
549 | 549 | ||
550 | idle = current_set[cpu]; | 550 | idle = current_set[cpu]; |
551 | cpu_lowcore = lowcore_ptr[cpu]; | 551 | cpu_lowcore = lowcore_ptr[cpu]; |