s390/facilities: cleanup PFMF and HPAGE machine facility detection
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Fri, 28 Sep 2012 13:06:41 +0000 (15:06 +0200)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Tue, 9 Oct 2012 12:16:55 +0000 (14:16 +0200)
commit3c7ef08bba65d1fef0b7486b30b5bbcdb42c5d9c
tree137f58766c6d6c0a4c2e055a687a6904528d9fb0
parent9e2d8656f5e8aa214e66b462680cf86b210b74a8
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>
arch/s390/include/asm/setup.h
arch/s390/kernel/early.c