diff options
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/libsas/sas_scsi_host.c | 3 | ||||
-rw-r--r-- | drivers/scsi/scsi_error.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c index d70ddfda93fc..9c5342e7a69c 100644 --- a/drivers/scsi/libsas/sas_scsi_host.c +++ b/drivers/scsi/libsas/sas_scsi_host.c | |||
@@ -40,6 +40,7 @@ | |||
40 | 40 | ||
41 | #include <linux/err.h> | 41 | #include <linux/err.h> |
42 | #include <linux/blkdev.h> | 42 | #include <linux/blkdev.h> |
43 | #include <linux/freezer.h> | ||
43 | #include <linux/scatterlist.h> | 44 | #include <linux/scatterlist.h> |
44 | 45 | ||
45 | /* ---------- SCSI Host glue ---------- */ | 46 | /* ---------- SCSI Host glue ---------- */ |
@@ -868,8 +869,6 @@ static int sas_queue_thread(void *_sas_ha) | |||
868 | { | 869 | { |
869 | struct sas_ha_struct *sas_ha = _sas_ha; | 870 | struct sas_ha_struct *sas_ha = _sas_ha; |
870 | 871 | ||
871 | current->flags |= PF_NOFREEZE; | ||
872 | |||
873 | while (1) { | 872 | while (1) { |
874 | set_current_state(TASK_INTERRUPTIBLE); | 873 | set_current_state(TASK_INTERRUPTIBLE); |
875 | schedule(); | 874 | schedule(); |
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index 9adb64ac054c..8a525abda30f 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/timer.h> | 19 | #include <linux/timer.h> |
20 | #include <linux/string.h> | 20 | #include <linux/string.h> |
21 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
22 | #include <linux/freezer.h> | ||
22 | #include <linux/kthread.h> | 23 | #include <linux/kthread.h> |
23 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
24 | #include <linux/blkdev.h> | 25 | #include <linux/blkdev.h> |
@@ -1516,8 +1517,6 @@ int scsi_error_handler(void *data) | |||
1516 | { | 1517 | { |
1517 | struct Scsi_Host *shost = data; | 1518 | struct Scsi_Host *shost = data; |
1518 | 1519 | ||
1519 | current->flags |= PF_NOFREEZE; | ||
1520 | |||
1521 | /* | 1520 | /* |
1522 | * We use TASK_INTERRUPTIBLE so that the thread is not | 1521 | * We use TASK_INTERRUPTIBLE so that the thread is not |
1523 | * counted against the load average as a running process. | 1522 | * counted against the load average as a running process. |