From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 16 Sep 2015 12:26:59 +0000 (+0200)
Subject: Revert "rcu: init rcu_registry_lock after fork"
X-Git-Tag: v2.5.0-rc0~122^2~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05620f85e930b0ac3dc22fdf8e4c390fa11afdeb;p=thirdparty%2Fqemu.git

Revert "rcu: init rcu_registry_lock after fork"

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>
---

diff --git a/util/rcu.c b/util/rcu.c
index 47c2bceac8e..8ba304dc441 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();
 }