diff options
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 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/include/asm/machine.h b/arch/s390/include/asm/machine.h index 33cb4403fc82..c31682d6c35d 100644 --- a/arch/s390/include/asm/machine.h +++ b/arch/s390/include/asm/machine.h @@ -12,6 +12,7 @@ #define MFEATURE_PCI_MIO 1 #define MFEATURE_SCC 2 #define MFEATURE_TLB_GUEST 3 +#define MFEATURE_TX 4 #ifndef __ASSEMBLY__ @@ -82,6 +83,7 @@ static __always_inline bool machine_has_##name(void) \ DEFINE_MACHINE_HAS_FEATURE(relocated_lowcore, MFEATURE_LOWCORE) DEFINE_MACHINE_HAS_FEATURE(scc, MFEATURE_SCC) DEFINE_MACHINE_HAS_FEATURE(tlb_guest, MFEATURE_TLB_GUEST) +DEFINE_MACHINE_HAS_FEATURE(tx, MFEATURE_TX) #endif /* __ASSEMBLY__ */ #endif /* __ASM_S390_MACHINE_H */ diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h index bb9d701ec9a6..7762fb342c39 100644 --- a/arch/s390/include/asm/setup.h +++ b/arch/s390/include/asm/setup.h @@ -22,7 +22,6 @@ #define MACHINE_FLAG_LPAR BIT(2) #define MACHINE_FLAG_DIAG9C BIT(3) #define MACHINE_FLAG_ESOP BIT(4) -#define MACHINE_FLAG_TE BIT(11) #define LPP_MAGIC BIT(31) #define LPP_PID_MASK _AC(0xffffffff, UL) @@ -72,7 +71,6 @@ extern unsigned long mio_wb_bit_mask; #define MACHINE_HAS_DIAG9C (get_lowcore()->machine_flags & MACHINE_FLAG_DIAG9C) #define MACHINE_HAS_ESOP (get_lowcore()->machine_flags & MACHINE_FLAG_ESOP) -#define MACHINE_HAS_TE (get_lowcore()->machine_flags & MACHINE_FLAG_TE) /* * Console mode. Override with conmode= |