lkml.org 
[lkml]   [2008]   [Oct]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 2/3] x86: signal: cosmetic unification of macros for setup_rt_frame()
    From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>

    Add #ifdef directive for unification.

    Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
    ---
    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


    \
     
     \ /
      Last update: 2008-10-30 02:49    [W:0.045 / U:121.184 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site