lkml.org 
[lkml]   [2012]   [Aug]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the rcu tree with the tip tree
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@canb.auug.org.au
>
> 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;
>
> /*




\
 
 \ /
  Last update: 2012-08-22 07:41    [W:0.024 / U:0.156 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site