diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2017-02-13 15:11:15 +0100 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2017-02-17 07:41:01 +0100 |
commit | 466178fc4e2937685edb7be005da4eb28bb81d72 (patch) | |
tree | f56310d79da358cb8ae1e0f2b870002b923fdd47 /arch/s390/kernel | |
parent | 604ddad038bfa0ae6f447c2ff29fcd430cec8181 (diff) | |
download | op-kernel-dev-466178fc4e2937685edb7be005da4eb28bb81d72.zip op-kernel-dev-466178fc4e2937685edb7be005da4eb28bb81d72.tar.gz |
s390: get rid of MACHINE_HAS_PFMF and MACHINE_HAS_HPAGE
Both MACHINE_HAS_PFMF and MACHINE_HAS_HPAGE are just an alias for
MACHINE_HAS_EDAT1. So simply use MACHINE_HAS_EDAT1 instead.
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')
-rw-r--r-- | arch/s390/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 8d59f20..e4d811f 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -749,7 +749,7 @@ static int __init setup_hwcaps(void) /* * Huge page support HWCAP_S390_HPAGE is bit 7. */ - if (MACHINE_HAS_HPAGE) + if (MACHINE_HAS_EDAT1) elf_hwcap |= HWCAP_S390_HPAGE; /* |