diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-04-18 22:05:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-04-18 22:05:17 -0700 |
| commit | ef29bf03ef66e8c00f2917668ffb0c15e75bce8b (patch) | |
| tree | b62f856b152fb987505b8da901989629927e7509 /drivers | |
| parent | 8488dd95ee9f05ba43f7f41e99ed34da00c313a6 (diff) | |
[PATCH] Rename PF_IOTHREAD to PF_NOFREEZE
From: Nigel Cunningham <ncunningham@users.sourceforge.net>
A few weeks ago, Pavel and I agreed that PF_IOTHREAD should be renamed to
PF_NOFREEZE. This reflects the fact that some threads so marked aren't
actually used for IO while suspending, but simply shouldn't be frozen.
This patch, against 2.6.5 vanilla, applies that change. In the
refrigerator calls, the actual value doesn't matter (so long as it's
non-zero) and it makes more sense to use PF_FREEZE so I've used that.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/loop.c | 2 | ||||
| -rw-r--r-- | drivers/input/serio/serio.c | 2 | ||||
| -rw-r--r-- | drivers/md/md.c | 2 | ||||
| -rw-r--r-- | drivers/net/8139too.c | 2 | ||||
| -rw-r--r-- | drivers/net/irda/sir_kthread.c | 2 | ||||
| -rw-r--r-- | drivers/net/irda/stir4200.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/airo.c | 2 | ||||
| -rw-r--r-- | drivers/pcmcia/cs.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/libata-core.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/scsi_error.c | 2 | ||||
| -rw-r--r-- | drivers/usb/core/hub.c | 2 | ||||
| -rw-r--r-- | drivers/usb/storage/usb.c | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index a43c545071cb..f9c506d93c69 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -483,7 +483,7 @@ static int loop_thread(void *data) * hence, it mustn't be stopped at all * because it could be indirectly used during suspension */ - current->flags |= PF_IOTHREAD; + current->flags |= PF_NOFREEZE; set_user_nice(current, -20); diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c index 0be7dafbed16..13d21bf45941 100644 --- a/drivers/input/serio/serio.c +++ b/drivers/input/serio/serio.c @@ -154,7 +154,7 @@ static int serio_thread(void *nothing) serio_handle_events(); wait_event_interruptible(serio_wait, !list_empty(&serio_event_list)); if (current->flags & PF_FREEZE) - refrigerator(PF_IOTHREAD); + refrigerator(PF_FREEZE); } while (!signal_pending(current)); printk(KERN_DEBUG "serio: kseriod exiting\n"); diff --git a/drivers/md/md.c b/drivers/md/md.c index b521ca509b1e..c451c8dba0b8 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -2712,7 +2712,7 @@ int md_thread(void * arg) wait_event_interruptible(thread->wqueue, test_bit(THREAD_WAKEUP, &thread->flags)); if (current->flags & PF_FREEZE) - refrigerator(PF_IOTHREAD); + refrigerator(PF_FREEZE); clear_bit(THREAD_WAKEUP, &thread->flags); diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index baae39b6d99c..d03c3a7e88da 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c @@ -1619,7 +1619,7 @@ static int rtl8139_thread (void *data) timeout = interruptible_sleep_on_timeout (&tp->thr_wait, timeout); /* make swsusp happy with our thread */ if (current->flags & PF_FREEZE) - refrigerator(PF_IOTHREAD); + refrigerator(PF_FREEZE); } while (!signal_pending (current) && (timeout > 0)); if (signal_pending (current)) { diff --git a/drivers/net/irda/sir_kthread.c b/drivers/net/irda/sir_kthread.c index 69d6ee5d28da..e53c6a54c2fd 100644 --- a/drivers/net/irda/sir_kthread.c +++ b/drivers/net/irda/sir_kthread.c @@ -137,7 +137,7 @@ static int irda_thread(void *startup) /* make swsusp happy with our thread */ if (current->flags & PF_FREEZE) - refrigerator(PF_IOTHREAD); + refrigerator(PF_FREEZE); run_irda_queue(); } diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c index 59bc5d86873e..f00f9c4bc8df 100644 --- a/drivers/net/irda/stir4200.c +++ b/drivers/net/irda/stir4200.c @@ -774,7 +774,7 @@ static int stir_transmit_thread(void *arg) write_reg(stir, REG_CTRL1, CTRL1_TXPWD|CTRL1_RXPWD); - refrigerator(PF_IOTHREAD); + refrigerator(PF_FREEZE); if (change_speed(stir, stir->speed)) break; diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 5545a9ad7736..e7204b770523 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c @@ -2883,7 +2883,7 @@ static int airo_thread(void *data) { /* make swsusp happy with our thread */ if (current->flags & PF_FREEZE) - refrigerator(PF_IOTHREAD); + refrigerator(PF_FREEZE); if (test_bit(JOB_DIE, &ai->flags)) break; diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c index c92a8b6eb176..3763e1dbbf8c 100644 --- a/drivers/pcmcia/cs.c +++ b/drivers/pcmcia/cs.c @@ -720,7 +720,7 @@ static int pccardd(void *__skt) schedule(); if (current->flags & PF_FREEZE) - refrigerator(PF_IOTHREAD); + refrigerator(PF_FREEZE); if (!skt->thread) break; diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index 4487de15884d..1f439965a732 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c @@ -2759,7 +2759,7 @@ static int ata_thread (void *data) flush_signals(current); if (current->flags & PF_FREEZE) - refrigerator(PF_IOTHREAD); + refrigerator(PF_FREEZE); if ((timeout < 0) || (ap->time_to_die)) diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index 54487593f6a2..58ac2319a342 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c @@ -1628,7 +1628,7 @@ int scsi_error_handler(void *data) daemonize("scsi_eh_%d", shost->host_no); - current->flags |= PF_IOTHREAD; + current->flags |= PF_NOFREEZE; shost->eh_wait = &sem; shost->ehandler = current; diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 289e48450d02..9aec0030b739 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -1259,7 +1259,7 @@ static int hub_thread(void *__hub) hub_events(); wait_event_interruptible(khubd_wait, !list_empty(&hub_event_list)); if (current->flags & PF_FREEZE) - refrigerator(PF_IOTHREAD); + refrigerator(PF_FREEZE); } while (!signal_pending(current)); pr_debug ("%s: khubd exiting\n", usbcore_name); diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c index ef04888ffd2d..e32ae272d10b 100644 --- a/drivers/usb/storage/usb.c +++ b/drivers/usb/storage/usb.c @@ -277,7 +277,7 @@ static int usb_stor_control_thread(void * __us) */ daemonize("usb-storage"); - current->flags |= PF_IOTHREAD; + current->flags |= PF_NOFREEZE; unlock_kernel(); |
