Merge 4.6-rc4 into char-misc-next

We want the fixes in there to build off of for other dependant patches.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

3 files changed, 11 insertions, 6 deletions

diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c
index e8b933111e0d..9c677f3f3c26 100644
--- a/drivers/misc/ibmasm/ibmasmfs.c
+++ b/drivers/misc/ibmasm/ibmasmfs.c
@@ -116,8 +116,8 @@ static int ibmasmfs_fill_super (struct super_block *sb, void *data, int silent)
 {
         struct inode *root;
 
-        sb->s_blocksize = PAGE_CACHE_SIZE;
-        sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
+        sb->s_blocksize = PAGE_SIZE;
+        sb->s_blocksize_bits = PAGE_SHIFT;
         sb->s_magic = IBMASMFS_MAGIC;
         sb->s_op = &ibmasmfs_s_ops;
         sb->s_time_gran = 1;
diff --git a/drivers/misc/lkdtm.c b/drivers/misc/lkdtm.c
index 5f1a36b8fbb0..0a5cbbe12452 100644
--- a/drivers/misc/lkdtm.c
+++ b/drivers/misc/lkdtm.c
@@ -458,8 +458,10 @@ static void lkdtm_do_action(enum ctype which)
                         break;
 
                 val = kmalloc(len, GFP_KERNEL);
-                if (!val)
+                if (!val) {
+                        kfree(base);
                         break;
+                }
 
                 *val = 0x12345678;
                 base[offset] = *val;
@@ -498,14 +500,17 @@ static void lkdtm_do_action(enum ctype which)
         }
         case CT_READ_BUDDY_AFTER_FREE: {
                 unsigned long p = __get_free_page(GFP_KERNEL);
-                int saw, *val = kmalloc(1024, GFP_KERNEL);
+                int saw, *val;
                 int *base;
 
                 if (!p)
                         break;
 
-                if (!val)
+                val = kmalloc(1024, GFP_KERNEL);
+                if (!val) {
+                        free_page(p);
                         break;
+                }
 
                 base = (int *)p;
 
diff --git a/drivers/misc/vmw_vmci/vmci_queue_pair.c b/drivers/misc/vmw_vmci/vmci_queue_pair.c
index f42d9c4e4561..f84a4275ca29 100644
--- a/drivers/misc/vmw_vmci/vmci_queue_pair.c
+++ b/drivers/misc/vmw_vmci/vmci_queue_pair.c
@@ -728,7 +728,7 @@ static void qp_release_pages(struct page **pages,
                 if (dirty)
                         set_page_dirty(pages[i]);
 
-                page_cache_release(pages[i]);
+                put_page(pages[i]);
                 pages[i] = NULL;
         }
 }