lkml.org 
[lkml]   [2012]   [Oct]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] rcu: Remove rcu_switch()
On Wed, Oct 03, 2012 at 08:21:52PM +0200, Frederic Weisbecker wrote:
> It's only there to call rcu_user_hooks_switch(). Let's
> just call rcu_user_hooks_switch() directly, we don't need this
> function in the middle.

Hello, Frederic!

Doesn't this also require an empty definition of rcu_user_hooks_switch()
to handle the CONFIG_RCU_USER_QS=n case? Or is there already such
a definition that I am too blind to see?

Thanx, Paul

> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
> Cc: Josh Triplett <josh@joshtriplett.org>
> Cc: Peter Zijlstra <peterz@infradead.org>
> ---
> include/linux/rcupdate.h | 2 ++
> include/linux/sched.h | 8 --------
> kernel/sched/core.c | 2 +-
> 3 files changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
> index 7c968e4..5d009de 100644
> --- a/include/linux/rcupdate.h
> +++ b/include/linux/rcupdate.h
> @@ -204,6 +204,8 @@ static inline void rcu_user_enter(void) { }
> static inline void rcu_user_exit(void) { }
> static inline void rcu_user_enter_after_irq(void) { }
> static inline void rcu_user_exit_after_irq(void) { }
> +static inline void rcu_user_hooks_switch(struct task_struct *prev,
> + struct task_struct *next) { }
> #endif /* CONFIG_RCU_USER_QS */
>
> extern void exit_rcu(void);
> diff --git a/include/linux/sched.h b/include/linux/sched.h
> index 9d51e26..65e2694 100644
> --- a/include/linux/sched.h
> +++ b/include/linux/sched.h
> @@ -1886,14 +1886,6 @@ static inline void rcu_copy_process(struct task_struct *p)
>
> #endif
>
> -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
> -}
> -
> static inline void tsk_restore_flags(struct task_struct *task,
> unsigned long orig_flags, unsigned long flags)
> {
> diff --git a/kernel/sched/core.c b/kernel/sched/core.c
> index c177472..a48bef7 100644
> --- a/kernel/sched/core.c
> +++ b/kernel/sched/core.c
> @@ -1887,7 +1887,7 @@ context_switch(struct rq *rq, struct task_struct *prev,
> #endif
>
> /* Here we just switch the register state and the stack. */
> - rcu_switch(prev, next);
> + rcu_user_hooks_switch(prev, next);
> switch_to(prev, next, prev);
>
> barrier();
> --
> 1.7.5.4
>



\
 
 \ /
  Last update: 2012-10-03 21:21    [W:0.052 / U:0.600 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site