summaryrefslogtreecommitdiff
path: root/include/linux/dax.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-05-13 19:49:35 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2017-05-13 19:49:35 +0300
commit1251704a631b62591ad1d1b6ead252e9e597d5f5 (patch)
treebc394a069d3b8aef8c6dc147438c05cc9ba057aa /include/linux/dax.h
parent0fcc3ab23d7395f58e8ab0834e7913e2e4314a83 (diff)
parentb340959ea281dbac15344277094d0a294dbe8aca (diff)
downloadlinux-1251704a631b62591ad1d1b6ead252e9e597d5f5.tar.xz
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton: "15 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: mm, docs: update memory.stat description with workingset* entries mm: vmscan: scan until it finds eligible pages mm, thp: copying user pages must schedule on collapse dax: fix PMD data corruption when fault races with write dax: fix data corruption when fault races with write ext4: return to starting transaction in ext4_dax_huge_fault() mm: fix data corruption due to stale mmap reads dax: prevent invalidation of mapped DAX entries Tigran has moved mm, vmalloc: fix vmalloc users tracking properly mm/khugepaged: add missed tracepoint for collapse_huge_page_swapin gcov: support GCC 7.1 mm, vmstat: Remove spurious WARN() during zoneinfo print time: delete current_fs_time() hwpoison, memcg: forcibly uncharge LRU pages
Diffstat (limited to 'include/linux/dax.h')
-rw-r--r--include/linux/dax.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/dax.h b/include/linux/dax.h
index 7fdf1d710042..00ebac854bb7 100644
--- a/include/linux/dax.h
+++ b/include/linux/dax.h
@@ -89,7 +89,6 @@ ssize_t dax_iomap_rw(struct kiocb *iocb, struct iov_iter *iter,
int dax_iomap_fault(struct vm_fault *vmf, enum page_entry_size pe_size,
const struct iomap_ops *ops);
int dax_delete_mapping_entry(struct address_space *mapping, pgoff_t index);
-int dax_invalidate_mapping_entry(struct address_space *mapping, pgoff_t index);
int dax_invalidate_mapping_entry_sync(struct address_space *mapping,
pgoff_t index);
void dax_wake_mapping_entry_waiter(struct address_space *mapping,