lkml.org 
[lkml]   [2015]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/24] frv: Remove signal translation and exec_domain
    Date
    As execution domain support is gone we can remove
    signal translation from the signal code and remove
    exec_domain from thread_info.

    Signed-off-by: Richard Weinberger <richard@nod.at>
    ---
    arch/blackfin/kernel/signal.c | 2 +-
    arch/frv/include/asm/thread_info.h | 2 --
    arch/frv/kernel/asm-offsets.c | 1 -
    arch/frv/kernel/signal.c | 20 ++++----------------
    4 files changed, 5 insertions(+), 20 deletions(-)

    diff --git a/arch/blackfin/kernel/signal.c b/arch/blackfin/kernel/signal.c
    index 1982a14..ea570db 100644
    --- a/arch/blackfin/kernel/signal.c
    +++ b/arch/blackfin/kernel/signal.c
    @@ -151,7 +151,7 @@ setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs)

    frame = get_sigframe(ksig, sizeof(*frame));

    - err |= __put_user(sig->sig, &frame->sig);
    + err |= __put_user(ksig->sig, &frame->sig);

    err |= __put_user(&frame->info, &frame->pinfo);
    err |= __put_user(&frame->uc, &frame->puc);
    diff --git a/arch/frv/include/asm/thread_info.h b/arch/frv/include/asm/thread_info.h
    index 6b917f1..ccba3b6 100644
    --- a/arch/frv/include/asm/thread_info.h
    +++ b/arch/frv/include/asm/thread_info.h
    @@ -31,7 +31,6 @@

    struct thread_info {
    struct task_struct *task; /* main task structure */
    - struct exec_domain *exec_domain; /* execution domain */
    unsigned long flags; /* low level flags */
    unsigned long status; /* thread-synchronous flags */
    __u32 cpu; /* current CPU */
    @@ -59,7 +58,6 @@ struct thread_info {
    #define INIT_THREAD_INFO(tsk) \
    { \
    .task = &tsk, \
    - .exec_domain = &default_exec_domain, \
    .flags = 0, \
    .cpu = 0, \
    .preempt_count = INIT_PREEMPT_COUNT, \
    diff --git a/arch/frv/kernel/asm-offsets.c b/arch/frv/kernel/asm-offsets.c
    index 446e89d..8414293 100644
    --- a/arch/frv/kernel/asm-offsets.c
    +++ b/arch/frv/kernel/asm-offsets.c
    @@ -34,7 +34,6 @@ void foo(void)
    {
    /* offsets into the thread_info structure */
    OFFSET(TI_TASK, thread_info, task);
    - OFFSET(TI_EXEC_DOMAIN, thread_info, exec_domain);
    OFFSET(TI_FLAGS, thread_info, flags);
    OFFSET(TI_STATUS, thread_info, status);
    OFFSET(TI_CPU, thread_info, cpu);
    diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c
    index 336713a..75c602d 100644
    --- a/arch/frv/kernel/signal.c
    +++ b/arch/frv/kernel/signal.c
    @@ -174,7 +174,7 @@ static inline void __user *get_sigframe(struct ksignal *ksig,
    static int setup_frame(struct ksignal *ksig, sigset_t *set)
    {
    struct sigframe __user *frame;
    - int rsig, sig = ksig->sig;
    + int sig = ksig->sig;

    set_fs(USER_DS);

    @@ -183,13 +183,7 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set)
    if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
    return -EFAULT;

    - rsig = sig;
    - if (sig < 32 &&
    - __current_thread_info->exec_domain &&
    - __current_thread_info->exec_domain->signal_invmap)
    - rsig = __current_thread_info->exec_domain->signal_invmap[sig];
    -
    - if (__put_user(rsig, &frame->sig) < 0)
    + if (__put_user(sig, &frame->sig) < 0)
    return -EFAULT;

    if (setup_sigcontext(&frame->sc, set->sig[0]))
    @@ -255,7 +249,7 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set)
    static int setup_rt_frame(struct ksignal *ksig, sigset_t *set)
    {
    struct rt_sigframe __user *frame;
    - int rsig, sig = ksig->sig;
    + int sig = ksig->sig;

    set_fs(USER_DS);

    @@ -264,13 +258,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set)
    if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
    return -EFAULT;

    - rsig = sig;
    - if (sig < 32 &&
    - __current_thread_info->exec_domain &&
    - __current_thread_info->exec_domain->signal_invmap)
    - rsig = __current_thread_info->exec_domain->signal_invmap[sig];
    -
    - if (__put_user(rsig, &frame->sig) ||
    + if (__put_user(sig, &frame->sig) ||
    __put_user(&frame->info, &frame->pinfo) ||
    __put_user(&frame->uc, &frame->puc))
    return -EFAULT;
    --
    1.8.4.5


    \
     
     \ /
      Last update: 2015-04-11 23:21    [W:4.427 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site