diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-12 17:15:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-12 17:15:33 -0800 |
| commit | 1f947a7a011fcceb14cb912f5481a53b18f1879a (patch) | |
| tree | 0c93fdd4b114af154ffbacd105b8f6775157a5be /mm/gup.c | |
| parent | 991b9eb4243b53e6dcaeda94e515d713ca7ddd2e (diff) | |
| parent | 27dd768ed8db48beefc4d9e006c58e7a00342bde (diff) | |
| download | linux-1f947a7a011fcceb14cb912f5481a53b18f1879a.tar.gz linux-1f947a7a011fcceb14cb912f5481a53b18f1879a.tar.bz2 linux-1f947a7a011fcceb14cb912f5481a53b18f1879a.zip | |
Merge branch 'akpm' (patches from Andrew)
Merge fixes from Andrew Morton:
"6 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm: proc: smaps_rollup: fix pss_locked calculation
Rename include/{uapi => }/asm-generic/shmparam.h really
Revert "mm: use early_pfn_to_nid in page_ext_init"
mm/gup: fix gup_pmd_range() for dax
Revert "mm: slowly shrink slabs with a relatively small number of objects"
Revert "mm: don't reclaim inodes with many attached pages"
Diffstat (limited to 'mm/gup.c')
| -rw-r--r-- | mm/gup.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1674,7 +1674,8 @@ static int gup_pmd_range(pud_t pud, unsigned long addr, unsigned long end, if (!pmd_present(pmd)) return 0; - if (unlikely(pmd_trans_huge(pmd) || pmd_huge(pmd))) { + if (unlikely(pmd_trans_huge(pmd) || pmd_huge(pmd) || + pmd_devmap(pmd))) { /* * NUMA hinting faults need to be handled in the GUP * slowpath for accounting purposes and so that they |