2 files changed, 2 insertions, 7 deletions

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 4503290da407..06eaa11cbc2f 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -68,6 +68,7 @@
 #include <linux/loop.h>
 #include <linux/compat.h>
 #include <linux/suspend.h>
+#include <linux/freezer.h>
 #include <linux/writeback.h>
 #include <linux/buffer_head.h>          /* for invalidate_bdev() */
 #include <linux/completion.h>
@@ -600,13 +601,6 @@ static int loop_thread(void *data)
         struct loop_device *lo = data;
         struct bio *bio;
 
-        /*
-         * loop can be used in an encrypted device,
-         * hence, it mustn't be stopped at all
-         * because it could be indirectly used during suspension
-         */
-        current->flags |= PF_NOFREEZE;
-
         set_user_nice(current, -20);
 
         while (!kthread_should_stop() || lo->lo_bio) {
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 7c294a40002e..31be33e4f119 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -1593,6 +1593,7 @@ static int kcdrwd(void *foobar)
         long min_sleep_time, residue;
 
         set_user_nice(current, -20);
+        set_freezable();
 
         for (;;) {
                 DECLARE_WAITQUEUE(wait, current);