diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-07 10:29:58 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-07 10:29:58 +0100 |
| commit | 258594a138f4ca9adf214f5272592d7f21def610 (patch) | |
| tree | d97ee71c997b0412f79b9ec4150cb52ce838fe13 /net/xfrm/xfrm_policy.c | |
| parent | a87d091434ed2a34d647979ab12084139ee1fe41 (diff) | |
| parent | ca3273f9646694e0419cfb9d6c12deb1c9aff27c (diff) | |
Merge branch 'sched/urgent' into sched/core
Diffstat (limited to 'net/xfrm/xfrm_policy.c')
| -rw-r--r-- | net/xfrm/xfrm_policy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 25872747762..058f04f54b9 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -315,9 +315,9 @@ static void xfrm_policy_kill(struct xfrm_policy *policy) return; } - spin_lock(&xfrm_policy_gc_lock); + spin_lock_bh(&xfrm_policy_gc_lock); hlist_add_head(&policy->bydst, &xfrm_policy_gc_list); - spin_unlock(&xfrm_policy_gc_lock); + spin_unlock_bh(&xfrm_policy_gc_lock); schedule_work(&xfrm_policy_gc_work); } |