From: Shaun Pereira When the sk_timer function x25_heartbeat_expiry() is called by the kernel in a running/terminating process, spinlock-recursion and spinlock-lockup locks up the kernel. This has happened with testing on some distro's and the patch below fixed it. Signed-off-by: Shaun Pereira Signed-off-by: Andrew Morton --- net/x25/x25_timer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff -puN net/x25/x25_timer.c~x25-fix-for-spinlock-recurse-and-spinlock-lockup-with net/x25/x25_timer.c --- devel/net/x25/x25_timer.c~x25-fix-for-spinlock-recurse-and-spinlock-lockup-with 2006-04-20 01:12:32.000000000 -0700 +++ devel-akpm/net/x25/x25_timer.c 2006-04-20 01:12:32.000000000 -0700 @@ -114,8 +114,9 @@ static void x25_heartbeat_expiry(unsigne if (sock_flag(sk, SOCK_DESTROY) || (sk->sk_state == TCP_LISTEN && sock_flag(sk, SOCK_DEAD))) { + bh_unlock_sock(sk); x25_destroy_socket(sk); - goto unlock; + return; } break; @@ -128,7 +129,6 @@ static void x25_heartbeat_expiry(unsigne } restart_heartbeat: x25_start_heartbeat(sk); -unlock: bh_unlock_sock(sk); } _