diff options
-rw-r--r-- | arch/s390/include/asm/processor.h | 1 | ||||
-rw-r--r-- | arch/s390/kernel/processor.c | 11 | ||||
-rw-r--r-- | arch/s390/kernel/smp.c | 4 |
3 files changed, 0 insertions, 16 deletions
diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h index 1988807d415e..bf3de04170a7 100644 --- a/arch/s390/include/asm/processor.h +++ b/arch/s390/include/asm/processor.h | |||
@@ -32,7 +32,6 @@ static inline void get_cpu_id(struct cpuid *ptr) | |||
32 | } | 32 | } |
33 | 33 | ||
34 | extern void s390_adjust_jiffies(void); | 34 | extern void s390_adjust_jiffies(void); |
35 | extern void print_cpu_info(void); | ||
36 | extern int get_cpu_capability(unsigned int *); | 35 | extern int get_cpu_capability(unsigned int *); |
37 | 36 | ||
38 | /* | 37 | /* |
diff --git a/arch/s390/kernel/processor.c b/arch/s390/kernel/processor.c index 644548e615c6..eeb651b48db3 100644 --- a/arch/s390/kernel/processor.c +++ b/arch/s390/kernel/processor.c | |||
@@ -35,17 +35,6 @@ void __cpuinit cpu_init(void) | |||
35 | } | 35 | } |
36 | 36 | ||
37 | /* | 37 | /* |
38 | * print_cpu_info - print basic information about a cpu | ||
39 | */ | ||
40 | void __cpuinit print_cpu_info(void) | ||
41 | { | ||
42 | struct cpuid *id = &per_cpu(cpu_id, smp_processor_id()); | ||
43 | |||
44 | pr_info("Processor %d started, address %d, identification %06X\n", | ||
45 | S390_lowcore.cpu_nr, stap(), id->ident); | ||
46 | } | ||
47 | |||
48 | /* | ||
49 | * show_cpuinfo - Get information on one CPU for use by procfs. | 38 | * show_cpuinfo - Get information on one CPU for use by procfs. |
50 | */ | 39 | */ |
51 | static int show_cpuinfo(struct seq_file *m, void *v) | 40 | static int show_cpuinfo(struct seq_file *m, void *v) |
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index 10766be524eb..63a97db83f96 100644 --- a/arch/s390/kernel/smp.c +++ b/arch/s390/kernel/smp.c | |||
@@ -471,8 +471,6 @@ int __cpuinit start_secondary(void *cpuvoid) | |||
471 | ipi_call_unlock(); | 471 | ipi_call_unlock(); |
472 | /* Switch on interrupts */ | 472 | /* Switch on interrupts */ |
473 | local_irq_enable(); | 473 | local_irq_enable(); |
474 | /* Print info about this processor */ | ||
475 | print_cpu_info(); | ||
476 | /* cpu_idle will call schedule for us */ | 474 | /* cpu_idle will call schedule for us */ |
477 | cpu_idle(); | 475 | cpu_idle(); |
478 | return 0; | 476 | return 0; |
@@ -681,7 +679,6 @@ void __cpu_die(unsigned int cpu) | |||
681 | udelay(10); | 679 | udelay(10); |
682 | smp_free_lowcore(cpu); | 680 | smp_free_lowcore(cpu); |
683 | atomic_dec(&init_mm.context.attach_count); | 681 | atomic_dec(&init_mm.context.attach_count); |
684 | pr_info("Processor %d stopped\n", cpu); | ||
685 | } | 682 | } |
686 | 683 | ||
687 | void cpu_die(void) | 684 | void cpu_die(void) |
@@ -707,7 +704,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus) | |||
707 | /* request the 0x1201 emergency signal external interrupt */ | 704 | /* request the 0x1201 emergency signal external interrupt */ |
708 | if (register_external_interrupt(0x1201, do_ext_call_interrupt) != 0) | 705 | if (register_external_interrupt(0x1201, do_ext_call_interrupt) != 0) |
709 | panic("Couldn't request external interrupt 0x1201"); | 706 | panic("Couldn't request external interrupt 0x1201"); |
710 | print_cpu_info(); | ||
711 | 707 | ||
712 | /* Reallocate current lowcore, but keep its contents. */ | 708 | /* Reallocate current lowcore, but keep its contents. */ |
713 | lowcore = (void *) __get_free_pages(GFP_KERNEL | GFP_DMA, LC_ORDER); | 709 | lowcore = (void *) __get_free_pages(GFP_KERNEL | GFP_DMA, LC_ORDER); |