diff options
| author | Gerald Schaefer | 2012-10-25 17:24:12 +0200 |
|---|---|---|
| committer | Martin Schwidefsky | 2012-10-26 16:44:23 +0200 |
| commit | 156152f84e57bff4d9b5d70be6f3f16116bf6fb1 (patch) | |
| tree | b34c630d1af92e327a1224061c975d21b12384c4 /arch/s390/mm | |
| parent | s390/cio: suppress 2nd path verification during resume (diff) | |
| download | kernel-qcow2-linux-156152f84e57bff4d9b5d70be6f3f16116bf6fb1.tar.gz kernel-qcow2-linux-156152f84e57bff4d9b5d70be6f3f16116bf6fb1.tar.xz kernel-qcow2-linux-156152f84e57bff4d9b5d70be6f3f16116bf6fb1.zip | |
s390/mm: use pmd_large() instead of pmd_huge()
Without CONFIG_HUGETLB_PAGE, pmd_huge() will always return 0. So
pmd_large() should be used instead in places where both transparent
huge pages and hugetlbfs pages can occur.
Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/mm')
| -rw-r--r-- | arch/s390/mm/gup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/mm/gup.c b/arch/s390/mm/gup.c index 60acb93a4680..8b8285310b5a 100644 --- a/arch/s390/mm/gup.c +++ b/arch/s390/mm/gup.c @@ -126,7 +126,7 @@ static inline int gup_pmd_range(pud_t *pudp, pud_t pud, unsigned long addr, */ if (pmd_none(pmd) || pmd_trans_splitting(pmd)) return 0; - if (unlikely(pmd_huge(pmd))) { + if (unlikely(pmd_large(pmd))) { if (!gup_huge_pmd(pmdp, pmd, addr, next, write, pages, nr)) return 0; |