patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / kernel / rcupdate.c

diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c
index f9324b7..13a1b5a 100644 (file)
--- a/kernel/rcupdate.c
+++ b/kernel/rcupdate.c
@@ -113,7 +113,7 @@ static void rcu_start_batch(long newbatch)
                return;
        }
        /* Can't change, since spin lock held. */
-       active = idle_cpu_mask;
+       active = nohz_cpu_mask;
        cpus_complement(active);
        cpus_and(rcu_ctrlblk.rcu_cpu_mask, cpu_online_map, active);
 }
@@ -223,13 +223,13 @@ static void rcu_process_callbacks(unsigned long unused)
 
        if (!list_empty(&RCU_curlist(cpu)) &&
            rcu_batch_after(rcu_ctrlblk.curbatch, RCU_batch(cpu))) {
-               list_splice(&RCU_curlist(cpu), &list);
+               __list_splice(&RCU_curlist(cpu), &list);
                INIT_LIST_HEAD(&RCU_curlist(cpu));
        }
 
        local_irq_disable();
        if (!list_empty(&RCU_nxtlist(cpu)) && list_empty(&RCU_curlist(cpu))) {
-               list_splice(&RCU_nxtlist(cpu), &RCU_curlist(cpu));
+               __list_splice(&RCU_nxtlist(cpu), &RCU_curlist(cpu));
                INIT_LIST_HEAD(&RCU_nxtlist(cpu));
                local_irq_enable();