From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from mail.kernel.org ([198.145.29.99]:44192 "EHLO mail.kernel.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1725770AbeLDNjl (ORCPT <rfc822;stable@vger.kernel.org>);
        Tue, 4 Dec 2018 08:39:41 -0500
Date: Tue, 4 Dec 2018 14:39:38 +0100
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
        Ingo Molnar <mingo@kernel.org>,
        Peter Zijlstra <peterz@infradead.org>,
        Andy Lutomirski <luto@kernel.org>,
        Linus Torvalds <torvalds@linux-foundation.org>,
        Jiri Kosina <jkosina@suse.cz>,
        Tom Lendacky <thomas.lendacky@amd.com>,
        Josh Poimboeuf <jpoimboe@redhat.com>,
        Andrea Arcangeli <aarcange@redhat.com>,
        David Woodhouse <dwmw@amazon.co.uk>,
        Tim Chen <tim.c.chen@linux.intel.com>,
        Andi Kleen <ak@linux.intel.com>,
        Dave Hansen <dave.hansen@intel.com>,
        Casey Schaufler <casey.schaufler@intel.com>,
        Asit Mallick <asit.k.mallick@intel.com>,
        Arjan van de Ven <arjan@linux.intel.com>,
        Jon Masters <jcm@redhat.com>,
        Waiman Long <longman9394@gmail.com>,
        Dave Stewart <david.c.stewart@intel.com>,
        Kees Cook <keescook@chromium.org>
Subject: Re: [PATCH 4.14 098/146] x86/process: Consolidate and simplify
 switch_to_xtra() code
Message-ID: <20181204133938.GA4749@kroah.com>
References: <20181204103726.750894136@linuxfoundation.org>
 <20181204103730.767674414@linuxfoundation.org>
 <alpine.DEB.2.21.1812041213140.8181@nanos.tec.linutronix.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <alpine.DEB.2.21.1812041213140.8181@nanos.tec.linutronix.de>
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

On Tue, Dec 04, 2018 at 12:14:13PM +0100, Thomas Gleixner wrote:
> On Tue, 4 Dec 2018, Greg Kroah-Hartman wrote:
> > --- a/arch/x86/kernel/process_32.c
> > +++ b/arch/x86/kernel/process_32.c
> > @@ -234,7 +234,6 @@ __switch_to(struct task_struct *prev_p,
> >  	struct fpu *prev_fpu = &prev->fpu;
> >  	struct fpu *next_fpu = &next->fpu;
> >  	int cpu = smp_processor_id();
> > -	struct tss_struct *tss = &per_cpu(cpu_tss_rw, cpu);
> >  
> >  	/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
> >  
> > @@ -266,12 +265,7 @@ __switch_to(struct task_struct *prev_p,
> >  	if (get_kernel_rpl() && unlikely(prev->iopl != next->iopl))
> >  		set_iopl_mask(next->iopl);
> >  
> > -	/*
> > -	 * Now maybe handle debug registers and/or IO bitmaps
> > -	 */
> > -	if (unlikely(task_thread_info(prev_p)->flags & _TIF_WORK_CTXSW_PREV ||
> > -		     task_thread_info(next_p)->flags & _TIF_WORK_CTXSW_NEXT))
> > -		__switch_to_xtra(prev_p, next_p, tss);
> > +	switch_to_extra(prev_p, next_p);
> 
> This is missing the hunk below.
> 
> Thanks,
> 
> 	tglx
> 
> 8<------------------
> 
> diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
> index 67cecc9a2b6f..c2df91eab573 100644
> --- a/arch/x86/kernel/process_32.c
> +++ b/arch/x86/kernel/process_32.c
> @@ -59,6 +59,8 @@
>  #include <asm/intel_rdt_sched.h>
>  #include <asm/proto.h>
>  
> +#include "process.h"
> +
>  void __show_regs(struct pt_regs *regs, int all)
>  {
>  	unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L;

Thanks, now updated.

greg k-h