diff mbox

[PULL,24/24] Revert "rcu: init rcu_registry_lock after fork"

Message ID 1442406595-14296-25-git-send-email-pbonzini@redhat.com
State New
Headers show

Commit Message

Paolo Bonzini Sept. 16, 2015, 12:29 p.m. UTC 
This reverts commit 5243722376873a48e9852a58b91f4d4101ee66e4.
The patch forgot about rcu_sync_lock and was committed by mistake.

Reported-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 util/rcu.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
diff mbox

Patch

diff --git a/util/rcu.c b/util/rcu.c
index 47c2bce..8ba304d 100644
--- a/util/rcu.c
+++ b/util/rcu.c
@@ -335,11 +335,6 @@  static void rcu_init_unlock(void)
     qemu_mutex_unlock(&rcu_registry_lock);
     qemu_mutex_unlock(&rcu_sync_lock);
 }
-
-static void rcu_init_child(void)
-{
-    qemu_mutex_init(&rcu_registry_lock);
-}
 #endif
 
 void rcu_after_fork(void)
@@ -351,7 +346,7 @@  void rcu_after_fork(void)
 static void __attribute__((__constructor__)) rcu_init(void)
 {
 #ifdef CONFIG_POSIX
-    pthread_atfork(rcu_init_lock, rcu_init_unlock, rcu_init_child);
+    pthread_atfork(rcu_init_lock, rcu_init_unlock, rcu_init_unlock);
 #endif
     rcu_init_complete();
 }