diff options
Diffstat (limited to 'arch/s390/kernel/setup.c')
-rw-r--r-- | arch/s390/kernel/setup.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index dd3c51736270..9c8853f21bb2 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c | |||
@@ -121,13 +121,10 @@ static struct resource data_resource = { | |||
121 | */ | 121 | */ |
122 | void __cpuinit cpu_init(void) | 122 | void __cpuinit cpu_init(void) |
123 | { | 123 | { |
124 | int addr = hard_smp_processor_id(); | ||
125 | |||
126 | /* | 124 | /* |
127 | * Store processor id in lowcore (used e.g. in timer_interrupt) | 125 | * Store processor id in lowcore (used e.g. in timer_interrupt) |
128 | */ | 126 | */ |
129 | get_cpu_id(&S390_lowcore.cpu_data.cpu_id); | 127 | get_cpu_id(&S390_lowcore.cpu_id); |
130 | S390_lowcore.cpu_data.cpu_addr = addr; | ||
131 | 128 | ||
132 | /* | 129 | /* |
133 | * Force FPU initialization: | 130 | * Force FPU initialization: |
@@ -686,7 +683,6 @@ setup_memory(void) | |||
686 | static void __init setup_hwcaps(void) | 683 | static void __init setup_hwcaps(void) |
687 | { | 684 | { |
688 | static const int stfl_bits[6] = { 0, 2, 7, 17, 19, 21 }; | 685 | static const int stfl_bits[6] = { 0, 2, 7, 17, 19, 21 }; |
689 | struct cpuinfo_S390 *cpuinfo = &S390_lowcore.cpu_data; | ||
690 | unsigned long long facility_list_extended; | 686 | unsigned long long facility_list_extended; |
691 | unsigned int facility_list; | 687 | unsigned int facility_list; |
692 | int i; | 688 | int i; |
@@ -732,7 +728,7 @@ static void __init setup_hwcaps(void) | |||
732 | if (MACHINE_HAS_HPAGE) | 728 | if (MACHINE_HAS_HPAGE) |
733 | elf_hwcap |= 1UL << 7; | 729 | elf_hwcap |= 1UL << 7; |
734 | 730 | ||
735 | switch (cpuinfo->cpu_id.machine) { | 731 | switch (S390_lowcore.cpu_id.machine) { |
736 | case 0x9672: | 732 | case 0x9672: |
737 | #if !defined(CONFIG_64BIT) | 733 | #if !defined(CONFIG_64BIT) |
738 | default: /* Use "g5" as default for 31 bit kernels. */ | 734 | default: /* Use "g5" as default for 31 bit kernels. */ |
@@ -825,7 +821,7 @@ setup_arch(char **cmdline_p) | |||
825 | setup_lowcore(); | 821 | setup_lowcore(); |
826 | 822 | ||
827 | cpu_init(); | 823 | cpu_init(); |
828 | __cpu_logical_map[0] = S390_lowcore.cpu_data.cpu_addr; | 824 | __cpu_logical_map[0] = stap(); |
829 | s390_init_cpu_topology(); | 825 | s390_init_cpu_topology(); |
830 | 826 | ||
831 | /* | 827 | /* |