[PATCH 1/3] x86: signal: cosmetic unification of signr_convert() - Kernel

This is a discussion on [PATCH 1/3] x86: signal: cosmetic unification of signr_convert() - Kernel ; From: Hiroshi Shimamoto Make signr_convert() same. Signed-off-by: Hiroshi Shimamoto --- arch/x86/kernel/signal_32.c | 2 ++ arch/x86/kernel/signal_64.c | 6 ++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c index 85a0d37..abf0df7 100644 --- a/arch/x86/kernel/signal_32.c +++ b/arch/x86/kernel/signal_32.c @@ -503,10 +503,12 @@ ...

+ Reply to Thread
Results 1 to 3 of 3

Thread: [PATCH 1/3] x86: signal: cosmetic unification of signr_convert()

  1. [PATCH 1/3] x86: signal: cosmetic unification of signr_convert()

    From: Hiroshi Shimamoto

    Make signr_convert() same.

    Signed-off-by: Hiroshi Shimamoto
    ---
    arch/x86/kernel/signal_32.c | 2 ++
    arch/x86/kernel/signal_64.c | 6 ++++++
    2 files changed, 8 insertions(+), 0 deletions(-)

    diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c
    index 85a0d37..abf0df7 100644
    --- a/arch/x86/kernel/signal_32.c
    +++ b/arch/x86/kernel/signal_32.c
    @@ -503,10 +503,12 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
    */
    static int signr_convert(int sig)
    {
    +#ifdef CONFIG_X86_32
    struct thread_info *info = current_thread_info();

    if (info->exec_domain && info->exec_domain->signal_invmap && sig < 32)
    return info->exec_domain->signal_invmap[sig];
    +#endif /* CONFIG_X86_32 */
    return sig;
    }

    diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c
    index 3d0deb3..a4b46e6 100644
    --- a/arch/x86/kernel/signal_64.c
    +++ b/arch/x86/kernel/signal_64.c
    @@ -295,6 +295,12 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
    */
    static int signr_convert(int sig)
    {
    +#ifdef CONFIG_X86_32
    + struct thread_info *info = current_thread_info();
    +
    + if (info->exec_domain && info->exec_domain->signal_invmap && sig < 32)
    + return info->exec_domain->signal_invmap[sig];
    +#endif /* CONFIG_X86_32 */
    return sig;
    }

    --
    1.5.6

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  2. [PATCH 2/3] x86: signal: cosmetic unification of macros for setup_rt_frame()

    From: Hiroshi Shimamoto

    Add #ifdef directive for unification.

    Signed-off-by: Hiroshi Shimamoto
    ---
    arch/x86/kernel/signal_32.c | 12 ++++++++++++
    arch/x86/kernel/signal_64.c | 14 ++++++++++++--
    2 files changed, 24 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c
    index abf0df7..6f3b9a9 100644
    --- a/arch/x86/kernel/signal_32.c
    +++ b/arch/x86/kernel/signal_32.c
    @@ -512,10 +512,22 @@ static int signr_convert(int sig)
    return sig;
    }

    +#ifdef CONFIG_X86_32
    +
    #define is_ia32 1
    #define ia32_setup_frame __setup_frame
    #define ia32_setup_rt_frame __setup_rt_frame

    +#else /* !CONFIG_X86_32 */
    +
    +#ifdef CONFIG_IA32_EMULATION
    +#define is_ia32 test_thread_flag(TIF_IA32)
    +#else /* !CONFIG_IA32_EMULATION */
    +#define is_ia32 0
    +#endif /* CONFIG_IA32_EMULATION */
    +
    +#endif /* CONFIG_X86_32 */
    +
    static int
    setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
    sigset_t *set, struct pt_regs *regs)
    diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c
    index a4b46e6..49df79e 100644
    --- a/arch/x86/kernel/signal_64.c
    +++ b/arch/x86/kernel/signal_64.c
    @@ -304,11 +304,21 @@ static int signr_convert(int sig)
    return sig;
    }

    +#ifdef CONFIG_X86_32
    +
    +#define is_ia32 1
    +#define ia32_setup_frame __setup_frame
    +#define ia32_setup_rt_frame __setup_rt_frame
    +
    +#else /* !CONFIG_X86_32 */
    +
    #ifdef CONFIG_IA32_EMULATION
    #define is_ia32 test_thread_flag(TIF_IA32)
    -#else
    +#else /* !CONFIG_IA32_EMULATION */
    #define is_ia32 0
    -#endif
    +#endif /* CONFIG_IA32_EMULATION */
    +
    +#endif /* CONFIG_X86_32 */

    static int
    setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
    --
    1.5.6

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  3. Re: [PATCH 1/3] x86: signal: cosmetic unification of signr_convert()


    * Hiroshi Shimamoto wrote:

    > From: Hiroshi Shimamoto
    >
    > Make signr_convert() same.
    >
    > Signed-off-by: Hiroshi Shimamoto
    > ---
    > arch/x86/kernel/signal_32.c | 2 ++
    > arch/x86/kernel/signal_64.c | 6 ++++++
    > 2 files changed, 8 insertions(+), 0 deletions(-)


    applied your patches to tip/x86/signal:

    5791775: x86: signal: cosmetic unification of NR_restart_syscall
    cabf503: x86: signal: cosmetic unification of macros for setup_rt_frame()
    96bf84b: x86: signal: cosmetic unification of signr_convert()

    thanks!

    Ingo
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

+ Reply to Thread