diff options
| author | Pavel Machek <pavel@ucw.cz> | 2005-01-14 23:26:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-14 23:26:28 -0800 |
| commit | f9adcf4ea1599e61743bccc5cabf35501e5ee51d (patch) | |
| tree | 4cf5db11ac0a3edc94c35258d06eff91247334fc /net | |
| parent | 1bed67e3cbd9fa5d4bf3f3dda9dfb105e2bcea87 (diff) | |
| download | history-f9adcf4ea1599e61743bccc5cabf35501e5ee51d.tar.gz | |
[PATCH] swsusp: refrigerator cleanups
This patch is from Nigel's swsusp2, it kills ugly #include <suspend.h> from
all over the tree, and makes code slightly nicer. I only left those parts
that do not change any code.
From: Nigel Cunningham <ncunningham@linuxmail.org>
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/sched.c | 1 | ||||
| -rw-r--r-- | net/sunrpc/svcsock.c | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c index af22e3b43ed226..be26e4c5b1a720 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c @@ -18,7 +18,6 @@ #include <linux/smp.h> #include <linux/smp_lock.h> #include <linux/spinlock.h> -#include <linux/suspend.h> #include <linux/sunrpc/clnt.h> #include <linux/sunrpc/xprt.h> diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 8d7e159822127d..7794c16d84bb29 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c @@ -31,7 +31,6 @@ #include <linux/slab.h> #include <linux/netdevice.h> #include <linux/skbuff.h> -#include <linux/suspend.h> #include <net/sock.h> #include <net/checksum.h> #include <net/ip.h> @@ -1227,8 +1226,7 @@ svc_recv(struct svc_serv *serv, struct svc_rqst *rqstp, long timeout) schedule_timeout(timeout); - if (current->flags & PF_FREEZE) - refrigerator(PF_FREEZE); + try_to_freeze(PF_FREEZE); spin_lock_bh(&serv->sv_lock); remove_wait_queue(&rqstp->rq_wait, &wait); |