6 files changed, 27 insertions, 44 deletions

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 940aced4ed00..3a73f995a81e 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -3985,7 +3985,6 @@ static int pidlist_array_load(struct cgroup *cgrp, enum cgroup_filetype type,
 
         l = cgroup_pidlist_find_create(cgrp, type);
         if (!l) {
-                mutex_unlock(&cgrp->pidlist_mutex);
                 pidlist_free(array);
                 return -ENOMEM;
         }
diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 22874d7cf2c0..52cb04c993b7 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -365,13 +365,14 @@ static void cpuset_update_task_spread_flag(struct cpuset *cs,
                                         struct task_struct *tsk)
 {
         if (is_spread_page(cs))
-                tsk->flags |= PF_SPREAD_PAGE;
+                task_set_spread_page(tsk);
         else
-                tsk->flags &= ~PF_SPREAD_PAGE;
+                task_clear_spread_page(tsk);
+
         if (is_spread_slab(cs))
-                tsk->flags |= PF_SPREAD_SLAB;
+                task_set_spread_slab(tsk);
         else
-                tsk->flags &= ~PF_SPREAD_SLAB;
+                task_clear_spread_slab(tsk);
 }
 
 /*
diff --git a/kernel/events/core.c b/kernel/events/core.c
index d640a8b4dcbc..963bf139e2b2 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -7948,8 +7948,10 @@ int perf_event_init_task(struct task_struct *child)
 
         for_each_task_context_nr(ctxn) {
                 ret = perf_event_init_context(child, ctxn);
-                if (ret)
+                if (ret) {
+                        perf_event_free_task(child);
                         return ret;
+                }
         }
 
         return 0;
diff --git a/kernel/fork.c b/kernel/fork.c
index 0cf9cdb6e491..a91e47d86de2 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1360,7 +1360,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,
                 goto bad_fork_cleanup_policy;
         retval = audit_alloc(p);
         if (retval)
-                goto bad_fork_cleanup_policy;
+                goto bad_fork_cleanup_perf;
         /* copy all the process information */
         shm_init_task(p);
         retval = copy_semundo(clone_flags, p);
@@ -1566,8 +1566,9 @@ bad_fork_cleanup_semundo:
         exit_sem(p);
 bad_fork_cleanup_audit:
         audit_free(p);
-bad_fork_cleanup_policy:
+bad_fork_cleanup_perf:
         perf_event_free_task(p);
+bad_fork_cleanup_policy:
 #ifdef CONFIG_NUMA
         mpol_put(p->mempolicy);
 bad_fork_cleanup_threadgroup_lock:
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index c4b8093c80b3..f1604d8cf489 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -725,14 +725,6 @@ static void memory_bm_clear_bit(struct memory_bitmap *bm, unsigned long pfn)
         clear_bit(bit, addr);
 }
 
-static void memory_bm_clear_current(struct memory_bitmap *bm)
-{
-        int bit;
-
-        bit = max(bm->cur.node_bit - 1, 0);
-        clear_bit(bit, bm->cur.node->data);
-}
-
 static int memory_bm_test_bit(struct memory_bitmap *bm, unsigned long pfn)
 {
         void *addr;
@@ -1341,35 +1333,23 @@ static struct memory_bitmap copy_bm;
 
 void swsusp_free(void)
 {
-        unsigned long fb_pfn, fr_pfn;
-
-        memory_bm_position_reset(forbidden_pages_map);
-        memory_bm_position_reset(free_pages_map);
-
-loop:
-        fr_pfn = memory_bm_next_pfn(free_pages_map);
-        fb_pfn = memory_bm_next_pfn(forbidden_pages_map);
-
-        /*
-         * Find the next bit set in both bitmaps. This is guaranteed to
-         * terminate when fb_pfn == fr_pfn == BM_END_OF_MAP.
-         */
-        do {
-                if (fb_pfn < fr_pfn)
-                        fb_pfn = memory_bm_next_pfn(forbidden_pages_map);
-                if (fr_pfn < fb_pfn)
-                        fr_pfn = memory_bm_next_pfn(free_pages_map);
-        } while (fb_pfn != fr_pfn);
-
-        if (fr_pfn != BM_END_OF_MAP && pfn_valid(fr_pfn)) {
-                struct page *page = pfn_to_page(fr_pfn);
+        struct zone *zone;
+        unsigned long pfn, max_zone_pfn;
 
-                memory_bm_clear_current(forbidden_pages_map);
-                memory_bm_clear_current(free_pages_map);
-                __free_page(page);
-                goto loop;
+        for_each_populated_zone(zone) {
+                max_zone_pfn = zone_end_pfn(zone);
+                for (pfn = zone->zone_start_pfn; pfn < max_zone_pfn; pfn++)
+                        if (pfn_valid(pfn)) {
+                                struct page *page = pfn_to_page(pfn);
+
+                                if (swsusp_page_is_forbidden(page) &&
+                                    swsusp_page_is_free(page)) {
+                                        swsusp_unset_page_forbidden(page);
+                                        swsusp_unset_page_free(page);
+                                        __free_page(page);
+                                }
+                        }
         }
-
         nr_copy_pages = 0;
         nr_meta_pages = 0;
         restore_pblist = NULL;
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index b38fb2b9e237..2d75c94ae87d 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -3359,7 +3359,7 @@ static void rb_iter_reset(struct ring_buffer_iter *iter)
         iter->head = cpu_buffer->reader_page->read;
 
         iter->cache_reader_page = iter->head_page;
-        iter->cache_read = iter->head;
+        iter->cache_read = cpu_buffer->read;
 
         if (iter->head)
                 iter->read_stamp = cpu_buffer->read_stamp;