From: Ingo Molnar Teach special (non-nested) unlocking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: "David S. Miller" Cc: Patrick McHardy Signed-off-by: Andrew Morton --- net/xfrm/xfrm_policy.c | 2 +- net/xfrm/xfrm_state.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN net/xfrm/xfrm_policy.c~lock-validator-special-locking-xfrm net/xfrm/xfrm_policy.c --- devel/net/xfrm/xfrm_policy.c~lock-validator-special-locking-xfrm 2006-05-29 18:13:34.000000000 -0700 +++ devel-akpm/net/xfrm/xfrm_policy.c 2006-05-29 18:13:34.000000000 -0700 @@ -1386,7 +1386,7 @@ static struct xfrm_policy_afinfo *xfrm_p read_lock(&xfrm_policy_afinfo_lock); afinfo = xfrm_policy_afinfo[family]; if (unlikely(!afinfo)) - read_unlock(&xfrm_policy_afinfo_lock); + read_unlock_non_nested(&xfrm_policy_afinfo_lock); return afinfo; } diff -puN net/xfrm/xfrm_state.c~lock-validator-special-locking-xfrm net/xfrm/xfrm_state.c --- devel/net/xfrm/xfrm_state.c~lock-validator-special-locking-xfrm 2006-05-29 18:13:34.000000000 -0700 +++ devel-akpm/net/xfrm/xfrm_state.c 2006-05-29 18:13:34.000000000 -0700 @@ -1106,7 +1106,7 @@ static struct xfrm_state_afinfo *xfrm_st read_lock(&xfrm_state_afinfo_lock); afinfo = xfrm_state_afinfo[family]; if (unlikely(!afinfo)) - read_unlock(&xfrm_state_afinfo_lock); + read_unlock_non_nested(&xfrm_state_afinfo_lock); return afinfo; } _