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

[Peter Zijlstra <peterz@infradead.org>]

On Fri, 2011-05-20 at 14:48 +0200, Daniel Hellstrom wrote:
> Subject: [PATCH] SCHED_TTWU_QUEUE is not longer needed since sparc32 now implements IPI
> 
> Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
> Reported-by: Peter Zijlstra <peterz@infradead.org>

Yep, this looks fine, please merge this patch through whatever tree
carries the sparc32-smp work.

Acked-by: Peter Zijlstra <peterz@infradead.org>

> ---
>  init/Kconfig   |    5 -----
>  kernel/sched.c |    2 +-
>  2 files changed, 1 insertions(+), 6 deletions(-)
> 
> diff --git a/init/Kconfig b/init/Kconfig
> index df64627..a66b656 100644
> --- a/init/Kconfig
> +++ b/init/Kconfig
> @@ -827,11 +827,6 @@ config SCHED_AUTOGROUP
>           desktop applications.  Task group autogeneration is currently 
> based
>           upon task session.
> 
> -config SCHED_TTWU_QUEUE
> -       bool
> -       depends on !SPARC32
> -       default y
> -
>  config MM_OWNER
>         bool
> 
> diff --git a/kernel/sched.c b/kernel/sched.c
> index c62acf4..0516af4 100644
> --- a/kernel/sched.c
> +++ b/kernel/sched.c
> @@ -2564,7 +2564,7 @@ static void ttwu_queue(struct task_struct *p, int cpu)
>  {
>         struct rq *rq = cpu_rq(cpu);
> 
> -#if defined(CONFIG_SMP) && defined(CONFIG_SCHED_TTWU_QUEUE)
> +#if defined(CONFIG_SMP)
>         if (sched_feat(TTWU_QUEUE) && cpu != smp_processor_id()) {
>                 ttwu_queue_remote(p, cpu);
>                 return;
> --