diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-05-21 12:33:04 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-05-21 12:33:04 -0700 |
| commit | 36092ee8ba695fce023b2118ececa6c2a56b1331 (patch) | |
| tree | b9579893cdd559e7b72fa569003b19792de58fad /mm | |
| parent | 1b982baf75e7d9585967fcfccd05b77bf9054010 (diff) | |
| parent | 03dca343afe080968d90c4d9196404b5bbbc8461 (diff) | |
| download | linux-stable-36092ee8ba695fce023b2118ececa6c2a56b1331.tar.gz linux-stable-36092ee8ba695fce023b2118ececa6c2a56b1331.tar.bz2 linux-stable-36092ee8ba695fce023b2118ececa6c2a56b1331.zip | |
Merge branch 'for-4.7/dax' into libnvdimm-for-next
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/huge_memory.c | 1 | ||||
| -rw-r--r-- | mm/hugetlb.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 86f9f8b82f8e..52ea012d8a80 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1013,6 +1013,7 @@ int vmf_insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr, insert_pfn_pmd(vma, addr, pmd, pfn, pgprot, write); return VM_FAULT_NOPAGE; } +EXPORT_SYMBOL_GPL(vmf_insert_pfn_pmd); static void touch_pmd(struct vm_area_struct *vma, unsigned long addr, pmd_t *pmd) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 19d0d08b396f..b14e98129b07 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -624,6 +624,7 @@ pgoff_t linear_hugepage_index(struct vm_area_struct *vma, { return vma_hugecache_offset(hstate_vma(vma), vma, address); } +EXPORT_SYMBOL_GPL(linear_hugepage_index); /* * Return the size of the pages allocated when backing a VMA. In the majority |