summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2016-03-14 17:06:54 -0800
committerKent Overstreet <kent.overstreet@gmail.com>2016-08-28 19:15:21 -0800
commiteea28a8431add43276e978455141a7616f39da78 (patch)
tree3f0b759ecae7a0672e0196f6e2398efc0df74c5a
parentbd1f4c3b60629c957f03b7f94db1bced11801106 (diff)
pm debugging
-rw-r--r--block/blk-core.c2
-rw-r--r--kernel/kmod.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 9c22406cdac3..eb70d01a37e5 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1931,6 +1931,8 @@ generic_make_request_checks(struct bio *bio)
might_sleep();
+ WARN_ON(!context_is_freezable());
+
if (bio_check_eod(bio, nr_sectors))
goto end_io;
diff --git a/kernel/kmod.c b/kernel/kmod.c
index 0277d1216f80..2ac3bdeaf0ca 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -218,6 +218,8 @@ static int call_usermodehelper_exec_async(void *data)
struct cred *new;
int retval;
+ set_freezable();
+
spin_lock_irq(&current->sighand->siglock);
flush_signal_handlers(current, 1);
spin_unlock_irq(&current->sighand->siglock);