diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2012-09-28 09:06:41 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2012-10-09 08:16:55 -0400 |
commit | 3c7ef08bba65d1fef0b7486b30b5bbcdb42c5d9c (patch) | |
tree | 137f58766c6d6c0a4c2e055a687a6904528d9fb0 /arch/s390/kernel/early.c | |
parent | 9e2d8656f5e8aa214e66b462680cf86b210b74a8 (diff) |
s390/facilities: cleanup PFMF and HPAGE machine facility detection
MACHINE_HAS_PFMF and MACHINE_HAS_HPAGE actually have the same semantics:
the cpu has the EDAT1 facility installed in zArch mode. So remove one
of the feature flags in machine_flags and rename the other one to EDAT1.
The two old macros simply get mapped to MACHINE_HAS_EDAT1.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/early.c')
-rw-r--r-- | arch/s390/kernel/early.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c index 00d11444506..4c91d078d09 100644 --- a/arch/s390/kernel/early.c +++ b/arch/s390/kernel/early.c | |||
@@ -283,14 +283,6 @@ static noinline __init void setup_facility_list(void) | |||
283 | ARRAY_SIZE(S390_lowcore.stfle_fac_list)); | 283 | ARRAY_SIZE(S390_lowcore.stfle_fac_list)); |
284 | } | 284 | } |
285 | 285 | ||
286 | static noinline __init void setup_hpage(void) | ||
287 | { | ||
288 | if (!test_facility(2) || !test_facility(8)) | ||
289 | return; | ||
290 | S390_lowcore.machine_flags |= MACHINE_FLAG_HPAGE; | ||
291 | __ctl_set_bit(0, 23); | ||
292 | } | ||
293 | |||
294 | static __init void detect_mvpg(void) | 286 | static __init void detect_mvpg(void) |
295 | { | 287 | { |
296 | #ifndef CONFIG_64BIT | 288 | #ifndef CONFIG_64BIT |
@@ -378,10 +370,12 @@ static __init void detect_diag44(void) | |||
378 | static __init void detect_machine_facilities(void) | 370 | static __init void detect_machine_facilities(void) |
379 | { | 371 | { |
380 | #ifdef CONFIG_64BIT | 372 | #ifdef CONFIG_64BIT |
373 | if (test_facility(8)) { | ||
374 | S390_lowcore.machine_flags |= MACHINE_FLAG_EDAT1; | ||
375 | __ctl_set_bit(0, 23); | ||
376 | } | ||
381 | if (test_facility(3)) | 377 | if (test_facility(3)) |
382 | S390_lowcore.machine_flags |= MACHINE_FLAG_IDTE; | 378 | S390_lowcore.machine_flags |= MACHINE_FLAG_IDTE; |
383 | if (test_facility(8)) | ||
384 | S390_lowcore.machine_flags |= MACHINE_FLAG_PFMF; | ||
385 | if (test_facility(27)) | 379 | if (test_facility(27)) |
386 | S390_lowcore.machine_flags |= MACHINE_FLAG_MVCOS; | 380 | S390_lowcore.machine_flags |= MACHINE_FLAG_MVCOS; |
387 | if (test_facility(40)) | 381 | if (test_facility(40)) |
@@ -484,7 +478,6 @@ void __init startup_init(void) | |||
484 | detect_diag9c(); | 478 | detect_diag9c(); |
485 | detect_diag44(); | 479 | detect_diag44(); |
486 | detect_machine_facilities(); | 480 | detect_machine_facilities(); |
487 | setup_hpage(); | ||
488 | setup_topology(); | 481 | setup_topology(); |
489 | sclp_facilities_detect(); | 482 | sclp_facilities_detect(); |
490 | detect_memory_layout(memory_chunk); | 483 | detect_memory_layout(memory_chunk); |