New get_cpu_id() inline assembly
From: Michael Holzheu <[email protected]>
[S390] New get_cpu_id() inline assembly
Replace two stidp inline assemblies with one global implementation.
Signed-off-by Michael Holzheu <[email protected]>
Signed-off-by Martin Schwidefsky <[email protected]>
---
arch/s390/kernel/early.c | 2 +- arch/s390/kernel/setup.c | 2 +- include/asm-s390/processor.h | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-)
arch/s390/kernel/early.c +1 -1
@@ -129,7 +129,7 @@ static noinline __init void detect_machi {struct cpuinfo_S390 *cpuinfo = &S390_lowcore.cpu_data; - asmvolatile ("stidp %0" :"=m" (S390_lowcore.cpu_data.cpu_id)); +get_cpu_id (&S390_lowcore.cpu_data.cpu_id);/* Running under z/VM ? */ if (cpuinfo->cpu_id.version ==0xff )
arch/s390/kernel/setup.c +1 -1
@@ -106,7 +106,7 @@ void __devinit cpu_init (void)/* * Store processor id in lowcore (used e.g. in timer_interrupt) */ - asmvolatile ("stidp %0" :"=m" (S390_lowcore.cpu_data.cpu_id)); +get_cpu_id (&S390_lowcore.cpu_data.cpu_id); S390_lowcore.cpu_data.cpu_addr = addr;/*
include/asm-s390/processor.h +5 -0
@@ -36,6 +36,11 @@ typedef struct unsigned int unused : 16; } __attribute__ ((packed)) cpuid_t; +static inline void get_cpu_id (cpuid_t *ptr) +{ + asmvolatile ("stidp 0(%1)" :"=m" (*ptr) :"a" (ptr)); +} +struct cpuinfo_S390 {cpuid_t cpu_id;
Signature · 8 lines
blue skies, IBM Deutschland Entwicklung GmbH
Martin Vorsitzender des Aufsichtsrats: Johann Weihen
Geschäftsführung: Herbert Kircher
Martin Schwidefsky Sitz der Gesellschaft: Böblingen
Linux on zSeries Registergericht: Amtsgericht Stuttgart,
Development HRB 243294
"Reality continues to ruin my life." - Calvin.