summaryrefslogtreecommitdiffstats
path: root/arch/s390/mm/hugetlbpage.c
diff options
context:
space:
mode:
authorDominik Dingel <dingel@linux.vnet.ibm.com>2015-06-25 23:59:49 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2015-06-26 02:00:35 +0200
commitcbd7d9c2b70f5e2fc78e0c90b3034b94dca6c82b (patch)
tree9b213ad5b67cec02ebb576646681af1433fb3b9f /arch/s390/mm/hugetlbpage.c
parents390/hugetlb: remove dead code for sw emulated huge pages (diff)
downloadlinux-cbd7d9c2b70f5e2fc78e0c90b3034b94dca6c82b.tar.xz
linux-cbd7d9c2b70f5e2fc78e0c90b3034b94dca6c82b.zip
s390/mm: forward check for huge pmds to pmd_large()
We already do the check in pmd_large, so we can just forward the call. Signed-off-by: Dominik Dingel <dingel@linux.vnet.ibm.com> Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/s390/mm/hugetlbpage.c')
-rw-r--r--arch/s390/mm/hugetlbpage.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/s390/mm/hugetlbpage.c b/arch/s390/mm/hugetlbpage.c
index 3bbfd4f43ed7..fb4bf2c4379e 100644
--- a/arch/s390/mm/hugetlbpage.c
+++ b/arch/s390/mm/hugetlbpage.c
@@ -141,10 +141,7 @@ pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr)
int pmd_huge(pmd_t pmd)
{
- if (!MACHINE_HAS_HPAGE)
- return 0;
-
- return !!(pmd_val(pmd) & _SEGMENT_ENTRY_LARGE);
+ return pmd_large(pmd);
}
int pud_huge(pud_t pud)