summaryrefslogtreecommitdiffstats
path: root/mm/huge_memory.c
diff options
context:
space:
mode:
authorKirill A. Shutemov2015-09-08 23:59:34 +0200
committerLinus Torvalds2015-09-09 00:35:28 +0200
commitd295e3415a88ae63a37a22652808b20c7fcb970e (patch)
treea4b702c5e99fc2c137ac2512c8ce02bd729e2556 /mm/huge_memory.c
parentthp: fix zap_huge_pmd() for DAX (diff)
downloadkernel-qcow2-linux-d295e3415a88ae63a37a22652808b20c7fcb970e.tar.gz
kernel-qcow2-linux-d295e3415a88ae63a37a22652808b20c7fcb970e.tar.xz
kernel-qcow2-linux-d295e3415a88ae63a37a22652808b20c7fcb970e.zip
dax: don't use set_huge_zero_page()
This is another place where DAX assumed that pgtable_t was a pointer. Open code the important parts of set_huge_zero_page() in DAX and make set_huge_zero_page() static again. Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Signed-off-by: Matthew Wilcox <willy@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/huge_memory.c')
-rw-r--r--mm/huge_memory.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 96dfd9d81fcb..3e574efad8f8 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -790,7 +790,7 @@ static inline gfp_t alloc_hugepage_gfpmask(int defrag, gfp_t extra_gfp)
}
/* Caller must hold page table lock. */
-bool set_huge_zero_page(pgtable_t pgtable, struct mm_struct *mm,
+static bool set_huge_zero_page(pgtable_t pgtable, struct mm_struct *mm,
struct vm_area_struct *vma, unsigned long haddr, pmd_t *pmd,
struct page *zero_page)
{