lkml.org 
[lkml]   [2012]   [Aug]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the rcu tree with Linus' tree
Hi Paul,

Today's linux-next merge of the rcu tree got a conflict in
include/linux/sched.h between commit 907aed48f65e ("mm: allow PF_MEMALLOC
from softirq context") from Linus' tree and commit 46fc4e7c01b7 ("rcu:
Switch task's syscall hooks on context switch") from the rcu tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc include/linux/sched.h
index b8c8664,a094959..0000000
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@@ -1886,13 -1879,14 +1886,21 @@@ static inline void rcu_copy_process(str

#endif

+static inline void tsk_restore_flags(struct task_struct *task,
+ unsigned long orig_flags, unsigned long flags)
+{
+ task->flags &= ~flags;
+ task->flags |= orig_flags & flags;
+}
+
+ static inline void rcu_switch(struct task_struct *prev,
+ struct task_struct *next)
+ {
+ #ifdef CONFIG_RCU_USER_QS
+ rcu_user_hooks_switch(prev, next);
+ #endif
+ }
+
#ifdef CONFIG_SMP
extern void do_set_cpus_allowed(struct task_struct *p,
const struct cpumask *new_mask);
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-08-06 05:21    [W:0.032 / U:0.044 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site