aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/kernel/early.c2
-rw-r--r--arch/s390/kernel/setup.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index e518dd53eff5..011e8c7acc7e 100644
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -129,7 +129,7 @@ static noinline __init void detect_machine_type(void)
129{ 129{
130 struct cpuinfo_S390 *cpuinfo = &S390_lowcore.cpu_data; 130 struct cpuinfo_S390 *cpuinfo = &S390_lowcore.cpu_data;
131 131
132 asm volatile("stidp %0" : "=m" (S390_lowcore.cpu_data.cpu_id)); 132 get_cpu_id(&S390_lowcore.cpu_data.cpu_id);
133 133
134 /* Running under z/VM ? */ 134 /* Running under z/VM ? */
135 if (cpuinfo->cpu_id.version == 0xff) 135 if (cpuinfo->cpu_id.version == 0xff)
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 50c5210fbc64..49567d8cd9a1 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -106,7 +106,7 @@ void __devinit cpu_init (void)
106 /* 106 /*
107 * Store processor id in lowcore (used e.g. in timer_interrupt) 107 * Store processor id in lowcore (used e.g. in timer_interrupt)
108 */ 108 */
109 asm volatile("stidp %0": "=m" (S390_lowcore.cpu_data.cpu_id)); 109 get_cpu_id(&S390_lowcore.cpu_data.cpu_id);
110 S390_lowcore.cpu_data.cpu_addr = addr; 110 S390_lowcore.cpu_data.cpu_addr = addr;
111 111
112 /* 112 /*