lkml.org 
[lkml]   [2008]   [Nov]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH v2 3/5] x86: ia32_signal: cleanup macro RELOAD_SEG
    From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>

    Impact: cleanup

    Remove mask parameter because it's always 3.
    Cleanup coding styles.

    Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
    Reviewed-by: WANG Cong <wangcong@zeuux.org>
    ---
    arch/x86/ia32/ia32_signal.c | 21 +++++++++++----------
    1 files changed, 11 insertions(+), 10 deletions(-)

    diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
    index f74178e..0b7fcf6 100644
    --- a/arch/x86/ia32/ia32_signal.c
    +++ b/arch/x86/ia32/ia32_signal.c
    @@ -207,13 +207,14 @@ struct rt_sigframe
    regs->seg = tmp | 3; \
    }

    -#define RELOAD_SEG(seg,mask) \
    - { unsigned int cur; \
    - unsigned short pre; \
    - err |= __get_user(pre, &sc->seg); \
    - savesegment(seg, cur); \
    - pre |= mask; \
    - if (pre != cur) loadsegment(seg, pre); }
    +#define RELOAD_SEG(seg) { \
    + unsigned int cur, pre; \
    + err |= __get_user(pre, &sc->seg); \
    + savesegment(seg, cur); \
    + pre |= 3; \
    + if (pre != cur) \
    + loadsegment(seg, pre); \
    +}

    static int ia32_restore_sigcontext(struct pt_regs *regs,
    struct sigcontext_ia32 __user *sc,
    @@ -244,9 +245,9 @@ static int ia32_restore_sigcontext(struct pt_regs *regs,
    if (gs != oldgs)
    load_gs_index(gs);

    - RELOAD_SEG(fs, 3);
    - RELOAD_SEG(ds, 3);
    - RELOAD_SEG(es, 3);
    + RELOAD_SEG(fs);
    + RELOAD_SEG(ds);
    + RELOAD_SEG(es);

    COPY(di); COPY(si); COPY(bp); COPY(sp); COPY(bx);
    COPY(dx); COPY(cx); COPY(ip);
    --
    1.5.6


    \
     
     \ /
      Last update: 2008-11-18 00:51    [W:2.909 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site