[patch 043/119] mm/gup: make __gup_device_* require THP

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: "Oliver O'Halloran" <oohall@xxxxxxxxx>
Subject: mm/gup: make __gup_device_* require THP

These functions are the only bits of generic code that use {pud,pmd}_pfn()
without checking for CONFIG_TRANSPARENT_HUGEPAGE.  This works fine on x86,
the only arch with devmap support, since the *_pfn() functions are always
defined there, but this isn't true for every architecture.

Link: http://lkml.kernel.org/r/20170626063833.11094-1-oohall@xxxxxxxxx
Signed-off-by: Oliver O'Halloran <oohall@xxxxxxxxx>
Cc: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 mm/gup.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN mm/gup.c~mm-gup-make-__gup_device_-require-thp mm/gup.c
--- a/mm/gup.c~mm-gup-make-__gup_device_-require-thp
+++ a/mm/gup.c
@@ -1352,7 +1352,7 @@ static int gup_pte_range(pmd_t pmd, unsi
 }
 #endif /* __HAVE_ARCH_PTE_SPECIAL */
 
-#ifdef __HAVE_ARCH_PTE_DEVMAP
+#if defined(__HAVE_ARCH_PTE_DEVMAP) && defined(CONFIG_TRANSPARENT_HUGEPAGE)
 static int __gup_device_huge(unsigned long pfn, unsigned long addr,
 		unsigned long end, struct page **pages, int *nr)
 {
_
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux