X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=kernel%2Frcutree_plugin.h;h=0e4f420245d97369b7fdf6bb99815789ffe13233;hb=db1afffab0b5d9f6d31f8f4bea44c9cb3bc59351;hp=9b18227e86e80c2cf80df1d1e37585374e078b45;hpb=77e38ed347162423c6b72e06c865a121081c2bb6;p=safe%2Fjmp%2Flinux-2.6

diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h
index 9b18227..0e4f420 100644
--- a/kernel/rcutree_plugin.h
+++ b/kernel/rcutree_plugin.h
@@ -557,11 +557,13 @@ void synchronize_rcu(void)
 	if (!rcu_scheduler_active)
 		return;
 
+	init_rcu_head_on_stack(&rcu.head);
 	init_completion(&rcu.completion);
 	/* Will wake me after RCU finished. */
 	call_rcu(&rcu.head, wakeme_after_rcu);
 	/* Wait for it. */
 	wait_for_completion(&rcu.completion);
+	destroy_rcu_head_on_stack(&rcu.head);
 }
 EXPORT_SYMBOL_GPL(synchronize_rcu);
 
@@ -1063,8 +1065,8 @@ int rcu_needs_cpu(int cpu)
 	for_each_online_cpu(thatcpu) {
 		if (thatcpu == cpu)
 			continue;
-		snap = per_cpu(rcu_dynticks, thatcpu)->dynticks;
-		snap_nmi = per_cpu(rcu_dynticks, thatcpu)->dynticks_nmi;
+		snap = per_cpu(rcu_dynticks, thatcpu).dynticks;
+		snap_nmi = per_cpu(rcu_dynticks, thatcpu).dynticks_nmi;
 		smp_mb(); /* Order sampling of snap with end of grace period. */
 		if (((snap & 0x1) != 0) || ((snap_nmi & 0x1) != 0)) {
 			per_cpu(rcu_dyntick_drain, cpu) = 0;