lkml.org 
[lkml]   [2024]   [Jan]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: x86/fred] x86/entry: Remove idtentry_sysvec from entry_{32,64}.S
    The following commit has been merged into the x86/fred branch of tip:

    Commit-ID: 3167b37f82ea8f9da156ff4edf100756bbc9277e
    Gitweb: https://git.kernel.org/tip/3167b37f82ea8f9da156ff4edf100756bbc9277e
    Author: Xin Li <xin3.li@intel.com>
    AuthorDate: Tue, 05 Dec 2023 02:49:51 -08:00
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitterDate: Thu, 25 Jan 2024 19:10:29 +01:00

    x86/entry: Remove idtentry_sysvec from entry_{32,64}.S

    idtentry_sysvec is really just DECLARE_IDTENTRY defined in
    <asm/idtentry.h>, no need to define it separately.

    Signed-off-by: Xin Li <xin3.li@intel.com>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Tested-by: Shan Kang <shan.kang@intel.com>
    Link: https://lore.kernel.org/r/20231205105030.8698-3-xin3.li@intel.com

    ---
    arch/x86/entry/entry_32.S | 4 ----
    arch/x86/entry/entry_64.S | 8 --------
    arch/x86/include/asm/idtentry.h | 2 +-
    3 files changed, 1 insertion(+), 13 deletions(-)

    diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S
    index c73047b..89a7ec0 100644
    --- a/arch/x86/entry/entry_32.S
    +++ b/arch/x86/entry/entry_32.S
    @@ -649,10 +649,6 @@ SYM_CODE_START_LOCAL(asm_\cfunc)
    SYM_CODE_END(asm_\cfunc)
    .endm

    -.macro idtentry_sysvec vector cfunc
    - idtentry \vector asm_\cfunc \cfunc has_error_code=0
    -.endm
    -
    /*
    * Include the defines which emit the idt entries which are shared
    * shared between 32 and 64 bit and emit the __irqentry_text_* markers
    diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
    index c40f89a..29ce68f 100644
    --- a/arch/x86/entry/entry_64.S
    +++ b/arch/x86/entry/entry_64.S
    @@ -370,14 +370,6 @@ SYM_CODE_END(\asmsym)
    idtentry \vector asm_\cfunc \cfunc has_error_code=1
    .endm

    -/*
    - * System vectors which invoke their handlers directly and are not
    - * going through the regular common device interrupt handling code.
    - */
    -.macro idtentry_sysvec vector cfunc
    - idtentry \vector asm_\cfunc \cfunc has_error_code=0
    -.endm
    -
    /**
    * idtentry_mce_db - Macro to generate entry stubs for #MC and #DB
    * @vector: Vector number
    diff --git a/arch/x86/include/asm/idtentry.h b/arch/x86/include/asm/idtentry.h
    index 13639e5..e9f71b3 100644
    --- a/arch/x86/include/asm/idtentry.h
    +++ b/arch/x86/include/asm/idtentry.h
    @@ -447,7 +447,7 @@ __visible noinstr void func(struct pt_regs *regs, \

    /* System vector entries */
    #define DECLARE_IDTENTRY_SYSVEC(vector, func) \
    - idtentry_sysvec vector func
    + DECLARE_IDTENTRY(vector, func)

    #ifdef CONFIG_X86_64
    # define DECLARE_IDTENTRY_MCE(vector, func) \
    \
     
     \ /
      Last update: 2024-05-27 14:33    [W:8.824 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site