On Tue, 16 Jan 2018, Joerg Roedel wrote: > From: Joerg Roedel <jroe...@suse.de> > > The stack addresss doesn't need to be stored in tss.sp0 if > we switch manually like on sysenter. Rename the offset so > that it still makes sense when we its location.
-ENOSENTENCE Other than that. Makes sense. > Signed-off-by: Joerg Roedel <jroe...@suse.de> > --- > arch/x86/entry/entry_32.S | 2 +- > arch/x86/kernel/asm-offsets_32.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S > index a1f28a54f23a..eb8c5615777b 100644 > --- a/arch/x86/entry/entry_32.S > +++ b/arch/x86/entry/entry_32.S > @@ -401,7 +401,7 @@ ENTRY(xen_sysenter_target) > * 0(%ebp) arg6 > */ > ENTRY(entry_SYSENTER_32) > - movl TSS_sysenter_sp0(%esp), %esp > + movl TSS_sysenter_stack(%esp), %esp > .Lsysenter_past_esp: > pushl $__USER_DS /* pt_regs->ss */ > pushl %ebp /* pt_regs->sp (stashed in bp) */ > diff --git a/arch/x86/kernel/asm-offsets_32.c > b/arch/x86/kernel/asm-offsets_32.c > index fa1261eefa16..654229bac2fc 100644 > --- a/arch/x86/kernel/asm-offsets_32.c > +++ b/arch/x86/kernel/asm-offsets_32.c > @@ -47,7 +47,7 @@ void foo(void) > BLANK(); > > /* Offset from the sysenter stack to tss.sp0 */ > - DEFINE(TSS_sysenter_sp0, offsetof(struct cpu_entry_area, > tss.x86_tss.sp0) - > + DEFINE(TSS_sysenter_stack, offsetof(struct cpu_entry_area, > tss.x86_tss.sp0) - > offsetofend(struct cpu_entry_area, entry_stack_page.stack)); > > #ifdef CONFIG_CC_STACKPROTECTOR > -- > 2.13.6 > >
