Merge branch 'linus' into release

Conflicts:
	arch/x86/kernel/cpu/cpufreq/longhaul.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 24 insertions, 4 deletions

diff --git a/mm/filemap.c b/mm/filemap.c
index 23acefe51808..fc11974f2bee 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -565,6 +565,24 @@ void wait_on_page_bit(struct page *page, int bit_nr)
 EXPORT_SYMBOL(wait_on_page_bit);
 
 /**
+ * add_page_wait_queue - Add an arbitrary waiter to a page's wait queue
+ * @page - Page defining the wait queue of interest
+ * @waiter - Waiter to add to the queue
+ *
+ * Add an arbitrary @waiter to the wait queue for the nominated @page.
+ */
+void add_page_wait_queue(struct page *page, wait_queue_t *waiter)
+{
+        wait_queue_head_t *q = page_waitqueue(page);
+        unsigned long flags;
+
+        spin_lock_irqsave(&q->lock, flags);
+        __add_wait_queue(q, waiter);
+        spin_unlock_irqrestore(&q->lock, flags);
+}
+EXPORT_SYMBOL_GPL(add_page_wait_queue);
+
+/**
  * unlock_page - unlock a locked page
  * @page: the page
  *
@@ -1823,7 +1841,7 @@ static size_t __iovec_copy_from_user_inatomic(char *vaddr,
                 int copy = min(bytes, iov->iov_len - base);
 
                 base = 0;
-                left = __copy_from_user_inatomic_nocache(vaddr, buf, copy);
+                left = __copy_from_user_inatomic(vaddr, buf, copy);
                 copied += copy;
                 bytes -= copy;
                 vaddr += copy;
@@ -1851,8 +1869,7 @@ size_t iov_iter_copy_from_user_atomic(struct page *page,
         if (likely(i->nr_segs == 1)) {
                 int left;
                 char __user *buf = i->iov->iov_base + i->iov_offset;
-                left = __copy_from_user_inatomic_nocache(kaddr + offset,
-                                                        buf, bytes);
+                left = __copy_from_user_inatomic(kaddr + offset, buf, bytes);
                 copied = bytes - left;
         } else {
                 copied = __iovec_copy_from_user_inatomic(kaddr + offset,
@@ -1880,7 +1897,7 @@ size_t iov_iter_copy_from_user(struct page *page,
         if (likely(i->nr_segs == 1)) {
                 int left;
                 char __user *buf = i->iov->iov_base + i->iov_offset;
-                left = __copy_from_user_nocache(kaddr + offset, buf, bytes);
+                left = __copy_from_user(kaddr + offset, buf, bytes);
                 copied = bytes - left;
         } else {
                 copied = __iovec_copy_from_user_inatomic(kaddr + offset,
@@ -2464,6 +2481,9 @@ EXPORT_SYMBOL(generic_file_aio_write);
  * (presumably at page->private).  If the release was successful, return `1'.
  * Otherwise return zero.
  *
+ * This may also be called if PG_fscache is set on a page, indicating that the
+ * page is known to the local caching routines.
+ *
  * The @gfp_mask argument specifies whether I/O may be performed to release
  * this page (__GFP_IO), and whether the call may block (__GFP_WAIT & __GFP_FS).
  *