Revert "rcu: init rcu_registry_lock after fork"
authorPaolo Bonzini <pbonzini@redhat.com>
Wed, 16 Sep 2015 12:26:59 +0000 (14:26 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Wed, 16 Sep 2015 15:33:32 +0000 (17:33 +0200)
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

index 47c2bceac8ec145273fa898b96686af6ad81b979..8ba304dc44118b3295151aebdeb496dd015c66b2 100644 (file)
@@ -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();
 }