diff options
| author | Heiko Carstens <hca@linux.ibm.com> | 2025-02-07 15:49:03 +0100 |
|---|---|---|
| committer | Vasily Gorbik <gor@linux.ibm.com> | 2025-03-04 17:18:06 +0100 |
| commit | c275169919d16c1db23324199b00a71e1e6ea950 (patch) | |
| tree | 2d722981737efca23dc2465db6144815bf537372 /arch/s390/include | |
| parent | s390/kvm: Convert MACHINE_HAS_ESOP to machine_has_esop() (diff) | |
| download | linux-c275169919d16c1db23324199b00a71e1e6ea950.tar.gz linux-c275169919d16c1db23324199b00a71e1e6ea950.zip | |
s390/diag: Convert MACHINE_HAS_DIAG9C to machine_has_diag9c()
Use static branch(es) to implement and use machine_has_diag9c() instead of
a runtime check via MACHINE_HAS_DIAG9C.
Reviewed-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Diffstat (limited to 'arch/s390/include')
| -rw-r--r-- | arch/s390/include/asm/machine.h | 2 | ||||
| -rw-r--r-- | arch/s390/include/asm/setup.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/s390/include/asm/machine.h b/arch/s390/include/asm/machine.h index dd61146d0a8d..4a1f1ab1888a 100644 --- a/arch/s390/include/asm/machine.h +++ b/arch/s390/include/asm/machine.h @@ -14,6 +14,7 @@ #define MFEATURE_TLB_GUEST 3 #define MFEATURE_TX 4 #define MFEATURE_ESOP 5 +#define MFEATURE_DIAG9C 6 #ifndef __ASSEMBLY__ @@ -86,6 +87,7 @@ DEFINE_MACHINE_HAS_FEATURE(scc, MFEATURE_SCC) DEFINE_MACHINE_HAS_FEATURE(tlb_guest, MFEATURE_TLB_GUEST) DEFINE_MACHINE_HAS_FEATURE(tx, MFEATURE_TX) DEFINE_MACHINE_HAS_FEATURE(esop, MFEATURE_ESOP) +DEFINE_MACHINE_HAS_FEATURE(diag9c, MFEATURE_DIAG9C) #endif /* __ASSEMBLY__ */ #endif /* __ASM_S390_MACHINE_H */ diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h index a90260f80f62..f465f82a9dca 100644 --- a/arch/s390/include/asm/setup.h +++ b/arch/s390/include/asm/setup.h @@ -20,7 +20,6 @@ #define MACHINE_FLAG_VM BIT(0) #define MACHINE_FLAG_KVM BIT(1) #define MACHINE_FLAG_LPAR BIT(2) -#define MACHINE_FLAG_DIAG9C BIT(3) #define LPP_MAGIC BIT(31) #define LPP_PID_MASK _AC(0xffffffff, UL) @@ -68,8 +67,6 @@ extern unsigned long mio_wb_bit_mask; #define MACHINE_IS_KVM (get_lowcore()->machine_flags & MACHINE_FLAG_KVM) #define MACHINE_IS_LPAR (get_lowcore()->machine_flags & MACHINE_FLAG_LPAR) -#define MACHINE_HAS_DIAG9C (get_lowcore()->machine_flags & MACHINE_FLAG_DIAG9C) - /* * Console mode. Override with conmode= */ |