From b574c1d3da8c17f3546e9c8be8a804a161273411 Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Tue, 18 Aug 2009 23:06:14 -0700 Subject: [PATCH] --- yaml --- r: 158154 b: refs/heads/master c: 1423cc033df017c762a9155eec470da77a460141 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/rcupdate.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6ba65ac280fd..8dcd6aa5344c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 684ca5cc9a772532bc893cdc994bd89bf0773719 +refs/heads/master: 1423cc033df017c762a9155eec470da77a460141 diff --git a/trunk/kernel/rcupdate.c b/trunk/kernel/rcupdate.c index 8df115600c2d..bd5d5c8e5140 100644 --- a/trunk/kernel/rcupdate.c +++ b/trunk/kernel/rcupdate.c @@ -238,7 +238,8 @@ static int __cpuinit rcu_barrier_cpu_hotplug(struct notifier_block *self, call_rcu_bh(rcu_migrate_head, rcu_migrate_callback); call_rcu_sched(rcu_migrate_head + 1, rcu_migrate_callback); call_rcu(rcu_migrate_head + 2, rcu_migrate_callback); - } else if (action == CPU_POST_DEAD) { + } else if (action == CPU_DOWN_PREPARE) { + /* Don't need to wait until next removal operation. */ /* rcu_migrate_head is protected by cpu_add_remove_lock */ wait_migrated_callbacks(); }