From 9e872cbebe0e7590924eca14dc7768f294386f9f Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 12 Dec 2007 11:24:19 -0800 Subject: [PATCH] --- yaml --- r: 74875 b: refs/heads/master c: 98eb5683fb94c458b3c8d121797bc9aa1baf4e7e h: refs/heads/master i: 74873: 62b126cdbf804be92f29c5867d4741cf21cc4dea 74871: 60056db574ab9ddcff3b6bf639bbe0bec8c0c843 v: v3 --- [refs] | 2 +- trunk/net/tipc/socket.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 954a55a23631..d75bb8676d0b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cbebc51f7b77d26ec23145d6ef22ac2b209f7955 +refs/heads/master: 98eb5683fb94c458b3c8d121797bc9aa1baf4e7e diff --git a/trunk/net/tipc/socket.c b/trunk/net/tipc/socket.c index 6b792265dc06..24ddfd2ca38b 100644 --- a/trunk/net/tipc/socket.c +++ b/trunk/net/tipc/socket.c @@ -253,7 +253,7 @@ static int release(struct socket *sock) dbg("sock_delete: %x\n",tsock); if (!tsock) return 0; - down_interruptible(&tsock->sem); + down(&tsock->sem); if (!sock->sk) { up(&tsock->sem); return 0;