diff options
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/include/asm/setup.h | 3 | ||||
-rw-r--r-- | arch/s390/kernel/early.c | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h index 089a49814c50..dbde7c236577 100644 --- a/arch/s390/include/asm/setup.h +++ b/arch/s390/include/asm/setup.h | |||
@@ -55,7 +55,6 @@ extern void detect_memory_memblock(void); | |||
55 | #define MACHINE_FLAG_LPP (1UL << 13) | 55 | #define MACHINE_FLAG_LPP (1UL << 13) |
56 | #define MACHINE_FLAG_TOPOLOGY (1UL << 14) | 56 | #define MACHINE_FLAG_TOPOLOGY (1UL << 14) |
57 | #define MACHINE_FLAG_TE (1UL << 15) | 57 | #define MACHINE_FLAG_TE (1UL << 15) |
58 | #define MACHINE_FLAG_RRBM (1UL << 16) | ||
59 | #define MACHINE_FLAG_TLB_LC (1UL << 17) | 58 | #define MACHINE_FLAG_TLB_LC (1UL << 17) |
60 | 59 | ||
61 | #define MACHINE_IS_VM (S390_lowcore.machine_flags & MACHINE_FLAG_VM) | 60 | #define MACHINE_IS_VM (S390_lowcore.machine_flags & MACHINE_FLAG_VM) |
@@ -78,7 +77,6 @@ extern void detect_memory_memblock(void); | |||
78 | #define MACHINE_HAS_LPP (0) | 77 | #define MACHINE_HAS_LPP (0) |
79 | #define MACHINE_HAS_TOPOLOGY (0) | 78 | #define MACHINE_HAS_TOPOLOGY (0) |
80 | #define MACHINE_HAS_TE (0) | 79 | #define MACHINE_HAS_TE (0) |
81 | #define MACHINE_HAS_RRBM (0) | ||
82 | #define MACHINE_HAS_TLB_LC (0) | 80 | #define MACHINE_HAS_TLB_LC (0) |
83 | #else /* CONFIG_64BIT */ | 81 | #else /* CONFIG_64BIT */ |
84 | #define MACHINE_HAS_IEEE (1) | 82 | #define MACHINE_HAS_IEEE (1) |
@@ -91,7 +89,6 @@ extern void detect_memory_memblock(void); | |||
91 | #define MACHINE_HAS_LPP (S390_lowcore.machine_flags & MACHINE_FLAG_LPP) | 89 | #define MACHINE_HAS_LPP (S390_lowcore.machine_flags & MACHINE_FLAG_LPP) |
92 | #define MACHINE_HAS_TOPOLOGY (S390_lowcore.machine_flags & MACHINE_FLAG_TOPOLOGY) | 90 | #define MACHINE_HAS_TOPOLOGY (S390_lowcore.machine_flags & MACHINE_FLAG_TOPOLOGY) |
93 | #define MACHINE_HAS_TE (S390_lowcore.machine_flags & MACHINE_FLAG_TE) | 91 | #define MACHINE_HAS_TE (S390_lowcore.machine_flags & MACHINE_FLAG_TE) |
94 | #define MACHINE_HAS_RRBM (S390_lowcore.machine_flags & MACHINE_FLAG_RRBM) | ||
95 | #define MACHINE_HAS_TLB_LC (S390_lowcore.machine_flags & MACHINE_FLAG_TLB_LC) | 92 | #define MACHINE_HAS_TLB_LC (S390_lowcore.machine_flags & MACHINE_FLAG_TLB_LC) |
96 | #endif /* CONFIG_64BIT */ | 93 | #endif /* CONFIG_64BIT */ |
97 | 94 | ||
diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c index 0dff972a169c..f6c66b5d0cfa 100644 --- a/arch/s390/kernel/early.c +++ b/arch/s390/kernel/early.c | |||
@@ -390,8 +390,6 @@ static __init void detect_machine_facilities(void) | |||
390 | S390_lowcore.machine_flags |= MACHINE_FLAG_LPP; | 390 | S390_lowcore.machine_flags |= MACHINE_FLAG_LPP; |
391 | if (test_facility(50) && test_facility(73)) | 391 | if (test_facility(50) && test_facility(73)) |
392 | S390_lowcore.machine_flags |= MACHINE_FLAG_TE; | 392 | S390_lowcore.machine_flags |= MACHINE_FLAG_TE; |
393 | if (test_facility(66)) | ||
394 | S390_lowcore.machine_flags |= MACHINE_FLAG_RRBM; | ||
395 | if (test_facility(51)) | 393 | if (test_facility(51)) |
396 | S390_lowcore.machine_flags |= MACHINE_FLAG_TLB_LC; | 394 | S390_lowcore.machine_flags |= MACHINE_FLAG_TLB_LC; |
397 | #endif | 395 | #endif |