Merge branch 'akpm' (patches from Andrew)

Merge fixes from Andrew Morton:
 "10 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  drivers/pinctrl/intel/pinctrl-baytrail.c: fix build with gcc-4.4
  update "mm/zsmalloc: don't fail if can't create debugfs info"
  dma-debug: avoid spinlock recursion when disabling dma-debug
  mm: oom_reaper: remove some bloat
  memcg: fix mem_cgroup_out_of_memory() return value.
  ocfs2: fix improper handling of return errno
  mm: slub: remove unused virt_to_obj()
  mm: kasan: remove unused 'reserved' field from struct kasan_alloc_meta
  mm: make CONFIG_DEFERRED_STRUCT_PAGE_INIT depends on !FLATMEM explicitly
  seqlock: fix raw_read_seqcount_latch()

4 files changed, 19 insertions, 20 deletions

diff --git a/mm/Kconfig b/mm/Kconfig
index 2664c118b5d2..22fa8189e4fc 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -649,6 +649,7 @@ config DEFERRED_STRUCT_PAGE_INIT
         default n
         depends on ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT
         depends on MEMORY_HOTPLUG
+        depends on !FLATMEM
         help
           Ordinarily all struct pages are initialised during early boot in a
           single thread. On very large machines this can take a considerable
diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h
index 7f7ac51d7faf..fb87923552ef 100644
--- a/mm/kasan/kasan.h
+++ b/mm/kasan/kasan.h
@@ -77,7 +77,6 @@ struct kasan_alloc_meta {
         struct kasan_track track;
         u32 state : 2;  /* enum kasan_state */
         u32 alloc_size : 30;
-        u32 reserved;
 };
 
 struct qlist_node {
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index cf428d7b9a03..f6477a9dbe7a 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1302,6 +1302,8 @@ static bool mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask,
                                 mem_cgroup_iter_break(memcg, iter);
                                 if (chosen)
                                         put_task_struct(chosen);
+                                /* Set a dummy value to return "true". */
+                                chosen = (void *) 1;
                                 goto unlock;
                         case OOM_SCAN_OK:
                                 break;
diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index 72698db958e7..b6d4f258cb53 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -45,6 +45,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -483,16 +485,16 @@ static inline unsigned long zs_stat_get(struct size_class *class,
 
 #ifdef CONFIG_ZSMALLOC_STAT
 
-static int __init zs_stat_init(void)
+static void __init zs_stat_init(void)
 {
-        if (!debugfs_initialized())
-                return -ENODEV;
+        if (!debugfs_initialized()) {
+                pr_warn("debugfs not available, stat dir not created\n");
+                return;
+        }
 
         zs_stat_root = debugfs_create_dir("zsmalloc", NULL);
         if (!zs_stat_root)
-                return -ENOMEM;
-
-        return 0;
+                pr_warn("debugfs 'zsmalloc' stat dir creation failed\n");
 }
 
 static void __exit zs_stat_exit(void)
@@ -577,8 +579,10 @@ static void zs_pool_stat_create(struct zs_pool *pool, const char *name)
 {
         struct dentry *entry;
 
-        if (!zs_stat_root)
+        if (!zs_stat_root) {
+                pr_warn("no root stat dir, not creating <%s> stat dir\n", name);
                 return;
+        }
 
         entry = debugfs_create_dir(name, zs_stat_root);
         if (!entry) {
@@ -592,7 +596,8 @@ static void zs_pool_stat_create(struct zs_pool *pool, const char *name)
         if (!entry) {
                 pr_warn("%s: debugfs file entry <%s> creation failed\n",
                                 name, "classes");
-                return;
+                debugfs_remove_recursive(pool->stat_dentry);
+                pool->stat_dentry = NULL;
         }
 }
 
@@ -602,9 +607,8 @@ static void zs_pool_stat_destroy(struct zs_pool *pool)
 }
 
 #else /* CONFIG_ZSMALLOC_STAT */
-static int __init zs_stat_init(void)
+static void __init zs_stat_init(void)
 {
-        return 0;
 }
 
 static void __exit zs_stat_exit(void)
@@ -2011,17 +2015,10 @@ static int __init zs_init(void)
         zpool_register_driver(&zs_zpool_driver);
 #endif
 
-        ret = zs_stat_init();
-        if (ret) {
-                pr_err("zs stat initialization failed\n");
-                goto stat_fail;
-        }
+        zs_stat_init();
+
         return 0;
 
-stat_fail:
-#ifdef CONFIG_ZPOOL
-        zpool_unregister_driver(&zs_zpool_driver);
-#endif
 notifier_fail:
         zs_unregister_cpu_notifier();