Merge tag 'v3.10.105' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / fs / coredump.c

diff --git a/fs/coredump.c b/fs/coredump.c
index 81c862591ca1da42885fab5f686fcad531c3c9e2..b398594e4f7fad12c7ace8447bb7316288d1221f 100644 (file)
--- a/fs/coredump.c
+++ b/fs/coredump.c
@@ -1,6 +1,7 @@
 #include <linux/slab.h>
 #include <linux/file.h>
 #include <linux/fdtable.h>
+#include <linux/freezer.h>
 #include <linux/mm.h>
 #include <linux/stat.h>
 #include <linux/fcntl.h>
@@ -375,7 +376,9 @@ static int coredump_wait(int exit_code, struct core_state *core_state)
        if (core_waiters > 0) {
                struct core_thread *ptr;
 
+               freezer_do_not_count();
                wait_for_completion(&core_state->startup);
+               freezer_count();
                /*
                 * Wait for all the threads to become inactive, so that
                 * all the thread context (extended register state, like