diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-19 19:17:35 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-19 19:17:35 -0800 |
| commit | da935c66bacb3ed9ada984b053297f87c2dff63a (patch) | |
| tree | 46278da2b312c73f1375b830d7e5912bf23abd78 /kernel/power/process.c | |
| parent | 9435eb1cf0b76b323019cebf8d16762a50a12a19 (diff) | |
| parent | 2205a6ea93fea76f88b43727fea53f3ce3790d6f (diff) | |
| download | linux-stable-da935c66bacb3ed9ada984b053297f87c2dff63a.tar.gz linux-stable-da935c66bacb3ed9ada984b053297f87c2dff63a.tar.bz2 linux-stable-da935c66bacb3ed9ada984b053297f87c2dff63a.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/e1000e/netdev.c
net/xfrm/xfrm_policy.c
Diffstat (limited to 'kernel/power/process.c')
| -rw-r--r-- | kernel/power/process.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/power/process.c b/kernel/power/process.c index d6d2a10320e0..0cf3a27a6c9d 100644 --- a/kernel/power/process.c +++ b/kernel/power/process.c @@ -22,7 +22,7 @@ */ #define TIMEOUT (20 * HZ) -static inline int freezeable(struct task_struct * p) +static inline int freezable(struct task_struct * p) { if ((p == current) || (p->flags & PF_NOFREEZE) || @@ -53,7 +53,7 @@ static int try_to_freeze_tasks(bool sig_only) todo = 0; read_lock(&tasklist_lock); do_each_thread(g, p) { - if (frozen(p) || !freezeable(p)) + if (frozen(p) || !freezable(p)) continue; if (!freeze_task(p, sig_only)) @@ -167,7 +167,7 @@ static void thaw_tasks(bool nosig_only) read_lock(&tasklist_lock); do_each_thread(g, p) { - if (!freezeable(p)) + if (!freezable(p)) continue; if (nosig_only && should_send_signal(p)) |