lkml.org 
[lkml]   [2021]   [Oct]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V3 48/49] x86/entry: Remove save_ret from PUSH_AND_CLEAR_REGS
    Date
    From: Lai Jiangshan <laijs@linux.alibaba.com>

    PUSH_AND_CLEAR_REGS is never used with save_ret anymore.

    Signed-off-by: Lai Jiangshan <laijs@linux.alibaba.com>
    ---
    arch/x86/entry/calling.h | 16 +++-------------
    1 file changed, 3 insertions(+), 13 deletions(-)

    diff --git a/arch/x86/entry/calling.h b/arch/x86/entry/calling.h
    index d42012fc694d..6f9de1c6da73 100644
    --- a/arch/x86/entry/calling.h
    +++ b/arch/x86/entry/calling.h
    @@ -63,15 +63,9 @@ For 32-bit we have the following conventions - kernel is built with
    * for assembly code:
    */

    -.macro PUSH_REGS rdx=%rdx rax=%rax save_ret=0
    - .if \save_ret
    - pushq %rsi /* pt_regs->si */
    - movq 8(%rsp), %rsi /* temporarily store the return address in %rsi */
    - movq %rdi, 8(%rsp) /* pt_regs->di (overwriting original return address) */
    - .else
    +.macro PUSH_REGS rdx=%rdx rax=%rax
    pushq %rdi /* pt_regs->di */
    pushq %rsi /* pt_regs->si */
    - .endif
    pushq \rdx /* pt_regs->dx */
    pushq %rcx /* pt_regs->cx */
    pushq \rax /* pt_regs->ax */
    @@ -86,10 +80,6 @@ For 32-bit we have the following conventions - kernel is built with
    pushq %r14 /* pt_regs->r14 */
    pushq %r15 /* pt_regs->r15 */
    UNWIND_HINT_REGS
    -
    - .if \save_ret
    - pushq %rsi /* return address on top of stack */
    - .endif
    .endm

    .macro CLEAR_REGS
    @@ -114,8 +104,8 @@ For 32-bit we have the following conventions - kernel is built with

    .endm

    -.macro PUSH_AND_CLEAR_REGS rdx=%rdx rax=%rax save_ret=0
    - PUSH_REGS rdx=\rdx, rax=\rax, save_ret=\save_ret
    +.macro PUSH_AND_CLEAR_REGS rdx=%rdx rax=%rax
    + PUSH_REGS rdx=\rdx, rax=\rax
    CLEAR_REGS
    .endm

    --
    2.19.1.6.gb485710b
    \
     
     \ /
      Last update: 2021-10-14 06:00    [W:5.631 / U:1.240 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site