diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-22 06:06:51 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-22 06:06:51 +0200 |
| commit | 8b53b57576292b92b27769f9e213df19b6e57786 (patch) | |
| tree | cd851ce4fa71b2653f120d7f11a9c6cbcf311b19 /net/ipv4/ipvs/ip_vs_sync.c | |
| parent | ab7e79243746e2a9c5f00243e60108189c44c9eb (diff) | |
| parent | 38cc1c3df77c1bb739a4766788eb9fa49f16ffdf (diff) | |
Merge branch 'x86/urgent' into x86/pat
Conflicts:
arch/x86/mm/pageattr.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/ipv4/ipvs/ip_vs_sync.c')
| -rw-r--r-- | net/ipv4/ipvs/ip_vs_sync.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ipvs/ip_vs_sync.c b/net/ipv4/ipvs/ip_vs_sync.c index 45e9bd96c28..a652da2c320 100644 --- a/net/ipv4/ipvs/ip_vs_sync.c +++ b/net/ipv4/ipvs/ip_vs_sync.c @@ -904,9 +904,9 @@ int stop_sync_thread(int state) * progress of stopping the master sync daemon. */ - spin_lock(&ip_vs_sync_lock); + spin_lock_bh(&ip_vs_sync_lock); ip_vs_sync_state &= ~IP_VS_STATE_MASTER; - spin_unlock(&ip_vs_sync_lock); + spin_unlock_bh(&ip_vs_sync_lock); kthread_stop(sync_master_thread); sync_master_thread = NULL; } else if (state == IP_VS_STATE_BACKUP) { |