[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CALCETrXNYe5+NGm0qPrGw+9A3DGZ0D08mbtbt5ObKCdpu7_Dcw@mail.gmail.com>
Date: Sat, 10 Jan 2015 14:12:51 -0800
From: Andy Lutomirski <luto@...capital.net>
To: Denys Vlasenko <dvlasenk@...hat.com>
Cc: "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
Linus Torvalds <torvalds@...ux-foundation.org>,
Oleg Nesterov <oleg@...hat.com>,
"H. Peter Anvin" <hpa@...or.com>, Borislav Petkov <bp@...en8.de>,
Frederic Weisbecker <fweisbec@...il.com>,
X86 ML <x86@...nel.org>, Alexei Starovoitov <ast@...mgrid.com>,
Will Drewry <wad@...omium.org>,
Kees Cook <keescook@...omium.org>
Subject: Re: [PATCH 1/4] x86: entry_64.S: delete unused code
On Sat, Jan 10, 2015 at 2:00 PM, Denys Vlasenko <dvlasenk@...hat.com> wrote:
> A define, two macros and an unreferenced bit of assembly are gone.
Acked-by: Andy Lutomirski <luto@...capital.net>
>
> Signed-off-by: Denys Vlasenko <dvlasenk@...hat.com>
> Acked-by: Borislav Petkov <bp@...e.de>
> CC: Linus Torvalds <torvalds@...ux-foundation.org>
> CC: Oleg Nesterov <oleg@...hat.com>
> CC: "H. Peter Anvin" <hpa@...or.com>
> CC: Borislav Petkov <bp@...en8.de>
> CC: Andy Lutomirski <luto@...capital.net>
> CC: Frederic Weisbecker <fweisbec@...il.com>
> CC: X86 ML <x86@...nel.org>
> CC: Alexei Starovoitov <ast@...mgrid.com>
> CC: Will Drewry <wad@...omium.org>
> CC: Kees Cook <keescook@...omium.org>
> CC: linux-kernel@...r.kernel.org
> ---
> arch/x86/include/asm/calling.h | 1 -
> arch/x86/kernel/entry_64.S | 34 ----------------------------------
> 2 files changed, 35 deletions(-)
>
> diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
> index 76659b6..1f1297b 100644
> --- a/arch/x86/include/asm/calling.h
> +++ b/arch/x86/include/asm/calling.h
> @@ -83,7 +83,6 @@ For 32-bit we have the following conventions - kernel is built with
> #define SS 160
>
> #define ARGOFFSET R11
> -#define SWFRAME ORIG_RAX
>
> .macro SAVE_ARGS addskip=0, save_rcx=1, save_r891011=1, rax_enosys=0
> subq $9*8+\addskip, %rsp
> diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
> index 931f32f..5ed4773 100644
> --- a/arch/x86/kernel/entry_64.S
> +++ b/arch/x86/kernel/entry_64.S
> @@ -155,27 +155,6 @@ ENDPROC(native_usergs_sysret64)
> movq \tmp,R11+\offset(%rsp)
> .endm
>
> - .macro FAKE_STACK_FRAME child_rip
> - /* push in order ss, rsp, eflags, cs, rip */
> - xorl %eax, %eax
> - pushq_cfi $__KERNEL_DS /* ss */
> - /*CFI_REL_OFFSET ss,0*/
> - pushq_cfi %rax /* rsp */
> - CFI_REL_OFFSET rsp,0
> - pushq_cfi $(X86_EFLAGS_IF|X86_EFLAGS_FIXED) /* eflags - interrupts on */
> - /*CFI_REL_OFFSET rflags,0*/
> - pushq_cfi $__KERNEL_CS /* cs */
> - /*CFI_REL_OFFSET cs,0*/
> - pushq_cfi \child_rip /* rip */
> - CFI_REL_OFFSET rip,0
> - pushq_cfi %rax /* orig rax */
> - .endm
> -
> - .macro UNFAKE_STACK_FRAME
> - addq $8*6, %rsp
> - CFI_ADJUST_CFA_OFFSET -(6*8)
> - .endm
> -
> /*
> * initial frame state for interrupts (and exceptions without error code)
> */
> @@ -626,19 +605,6 @@ END(\label)
> FORK_LIKE vfork
> FIXED_FRAME stub_iopl, sys_iopl
>
> -ENTRY(ptregscall_common)
> - DEFAULT_FRAME 1 8 /* offset 8: return address */
> - RESTORE_TOP_OF_STACK %r11, 8
> - movq_cfi_restore R15+8, r15
> - movq_cfi_restore R14+8, r14
> - movq_cfi_restore R13+8, r13
> - movq_cfi_restore R12+8, r12
> - movq_cfi_restore RBP+8, rbp
> - movq_cfi_restore RBX+8, rbx
> - ret $REST_SKIP /* pop extended registers */
> - CFI_ENDPROC
> -END(ptregscall_common)
> -
> ENTRY(stub_execve)
> CFI_STARTPROC
> addq $8, %rsp
> --
> 1.8.1.4
>
--
Andy Lutomirski
AMA Capital Management, LLC
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists