Commit-ID: 6a613ac6bc015f8ef75806d397d69dbac4a8d8c4 Gitweb: http://git.kernel.org/tip/6a613ac6bc015f8ef75806d397d69dbac4a8d8c4 Author: Andy Lutomirski <luto@xxxxxxxxxx> AuthorDate: Wed, 16 Dec 2015 23:18:47 -0800 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitDate: Mon, 21 Dec 2015 16:05:01 +0100 x86/entry: Fix some comments Signed-off-by: Andy Lutomirski <luto@xxxxxxxxxx> Reviewed-and-tested-by: Borislav Petkov <bp@xxxxxxxxx> Cc: <mark.gross@xxxxxxxxx> Cc: Su Tao <tao.su@xxxxxxxxx> Cc: Denys Vlasenko <dvlasenk@xxxxxxxxxx> Cc: <qiuxu.zhuo@xxxxxxxxx> Cc: <frank.wang@xxxxxxxxx> Cc: <borun.fu@xxxxxxxxx> Cc: Brian Gerst <brgerst@xxxxxxxxx> Cc: Mingwei Shi <mingwei.shi@xxxxxxxxx> Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> --- arch/x86/entry/entry_32.S | 2 +- arch/x86/entry/vdso/vdso32/system_call.S | 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 0870825..fcad8ac 100644 --- a/arch/x86/entry/entry_32.S +++ b/arch/x86/entry/entry_32.S @@ -292,7 +292,7 @@ ENTRY(entry_SYSENTER_32) movl TSS_sysenter_sp0(%esp), %esp sysenter_past_esp: pushl $__USER_DS /* pt_regs->ss */ - pushl %ecx /* pt_regs->cx */ + pushl %ecx /* pt_regs->sp (stashed in cx) */ pushfl /* pt_regs->flags (except IF = 0) */ orl $X86_EFLAGS_IF, (%esp) /* Fix IF */ pushl $__USER_CS /* pt_regs->cs */ diff --git a/arch/x86/entry/vdso/vdso32/system_call.S b/arch/x86/entry/vdso/vdso32/system_call.S index 93bd845..8f42b1b 100644 --- a/arch/x86/entry/vdso/vdso32/system_call.S +++ b/arch/x86/entry/vdso/vdso32/system_call.S @@ -1,5 +1,5 @@ /* - * Code for the vDSO. This version uses the old int $0x80 method. + * AT_SYSINFO entry point */ #include <asm/dwarf2.h> -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|