Re: linux-next: manual merge of the rcu tree with the tip tree

[Paul E. McKenney]

On Wed, Aug 22, 2012 at 02:27:35PM +1000, Stephen Rothwell wrote:
> Hi Paul,
> 
> Today's linux-next merge of the rcu tree got a conflict in
> kernel/rcutree.h between commit 62ab7072476a ("rcu: Use
> smp_hotplug_thread facility for RCUs per-CPU kthread") from the tip tree
> and commit daa5d37ff51b ("rcu: Prevent force_quiescent_state() memory
> contention") from the rcu tree.
> 
> Just context changes (I think).  I fixed it up (see below) and can carry
> the fix as necessary.

This one also looks correct.

							Thanx, Paul

> -- 
> Cheers,
> Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
> 
> diff --cc kernel/rcutree.h
> index 1224d4c,c2a3e7d..0000000
> --- a/kernel/rcutree.h
> +++ b/kernel/rcutree.h
> @@@ -196,6 -200,13 +200,7 @@@ struct rcu_node 
>   				/* Refused to boost: not sure why, though. */
>   				/*  This can happen due to race conditions. */
>   #endif /* #ifdef CONFIG_RCU_BOOST */
>  -	struct task_struct *node_kthread_task;
>  -				/* kthread that takes care of this rcu_node */
>  -				/*  structure, for example, awakening the */
>  -				/*  per-CPU kthreads as needed. */
>  -	unsigned int node_kthread_status;
>  -				/* State of node_kthread_task for tracing. */
> + 	raw_spinlock_t fqslock ____cacheline_internodealigned_in_smp;
>   } ____cacheline_internodealigned_in_smp;
>   
>   /*


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/