diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 17:16:53 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 17:16:53 -0700 |
commit | 2031d0f586839bc68f35bcf8580b18947f8491d4 (patch) | |
tree | e317615b4cb62350edeea0afe0a4fc94152cee29 /net | |
parent | 98e7f29418a4931f97e6b78d1ef3a47103fe6cd5 (diff) | |
parent | 3e1d1d28d99dabe63c64f7f40f1ca1d646de1f73 (diff) | |
download | kernel_samsung_crespo-2031d0f586839bc68f35bcf8580b18947f8491d4.zip kernel_samsung_crespo-2031d0f586839bc68f35bcf8580b18947f8491d4.tar.gz kernel_samsung_crespo-2031d0f586839bc68f35bcf8580b18947f8491d4.tar.bz2 |
Merge Christoph's freeze cleanup patch
Diffstat (limited to 'net')
-rw-r--r-- | net/rxrpc/krxiod.c | 2 | ||||
-rw-r--r-- | net/rxrpc/krxsecd.c | 2 | ||||
-rw-r--r-- | net/rxrpc/krxtimod.c | 2 | ||||
-rw-r--r-- | net/sunrpc/svcsock.c | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/net/rxrpc/krxiod.c b/net/rxrpc/krxiod.c index 2b537f4..dada34a 100644 --- a/net/rxrpc/krxiod.c +++ b/net/rxrpc/krxiod.c @@ -138,7 +138,7 @@ static int rxrpc_krxiod(void *arg) _debug("### End Work"); - try_to_freeze(PF_FREEZE); + try_to_freeze(); /* discard pending signals */ rxrpc_discard_my_signals(); diff --git a/net/rxrpc/krxsecd.c b/net/rxrpc/krxsecd.c index 6020c89..1aadd02 100644 --- a/net/rxrpc/krxsecd.c +++ b/net/rxrpc/krxsecd.c @@ -107,7 +107,7 @@ static int rxrpc_krxsecd(void *arg) _debug("### End Inbound Calls"); - try_to_freeze(PF_FREEZE); + try_to_freeze(); /* discard pending signals */ rxrpc_discard_my_signals(); diff --git a/net/rxrpc/krxtimod.c b/net/rxrpc/krxtimod.c index 249c2b0..3ac81cd 100644 --- a/net/rxrpc/krxtimod.c +++ b/net/rxrpc/krxtimod.c @@ -90,7 +90,7 @@ static int krxtimod(void *arg) complete_and_exit(&krxtimod_dead, 0); } - try_to_freeze(PF_FREEZE); + try_to_freeze(); /* discard pending signals */ rxrpc_discard_my_signals(); diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 0590703..56db8f1 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c @@ -1185,8 +1185,8 @@ svc_recv(struct svc_serv *serv, struct svc_rqst *rqstp, long timeout) arg->page_len = (pages-2)*PAGE_SIZE; arg->len = (pages-1)*PAGE_SIZE; arg->tail[0].iov_len = 0; - - try_to_freeze(PF_FREEZE); + + try_to_freeze(); if (signalled()) return -EINTR; @@ -1227,7 +1227,7 @@ svc_recv(struct svc_serv *serv, struct svc_rqst *rqstp, long timeout) schedule_timeout(timeout); - try_to_freeze(PF_FREEZE); + try_to_freeze(); spin_lock_bh(&serv->sv_lock); remove_wait_queue(&rqstp->rq_wait, &wait); |