lkml.org 
[lkml]   [2015]   [Jul]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/asm] um: Fix do_signal() prototype
    Commit-ID:  ccaee5f851470dec6894a6835b6fadffc2bb7514
    Gitweb: http://git.kernel.org/tip/ccaee5f851470dec6894a6835b6fadffc2bb7514
    Author: Ingo Molnar <mingo@kernel.org>
    AuthorDate: Fri, 3 Jul 2015 12:44:20 -0700
    Committer: Ingo Molnar <mingo@kernel.org>
    CommitDate: Tue, 7 Jul 2015 10:58:54 +0200

    um: Fix do_signal() prototype

    Once x86 exports its do_signal(), the prototypes will clash.

    Fix the clash and also improve the code a bit: remove the
    unnecessary kern_do_signal() indirection. This allows
    interrupt_end() to share the 'regs' parameter calculation.

    Also remove the unused return code to match x86.

    Minimally build and boot tested.

    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Signed-off-by: Andy Lutomirski <luto@kernel.org>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Andy Lutomirski <luto@amacapital.net>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Brian Gerst <brgerst@gmail.com>
    Cc: Denys Vlasenko <dvlasenk@redhat.com>
    Cc: Denys Vlasenko <vda.linux@googlemail.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: H. Peter Anvin <hpa@zytor.com>
    Cc: Kees Cook <keescook@chromium.org>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Richard Weinberger <richard.weinberger@gmail.com>
    Cc: Rik van Riel <riel@redhat.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: paulmck@linux.vnet.ibm.com
    Link: http://lkml.kernel.org/r/67c57eac09a589bac3c6c5ff22f9623ec55a184a.1435952415.git.luto@kernel.org
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    ---
    arch/um/include/shared/kern_util.h | 3 ++-
    arch/um/kernel/process.c | 6 ++++--
    arch/um/kernel/signal.c | 8 +-------
    arch/um/kernel/tlb.c | 2 +-
    arch/um/kernel/trap.c | 2 +-
    5 files changed, 9 insertions(+), 12 deletions(-)

    diff --git a/arch/um/include/shared/kern_util.h b/arch/um/include/shared/kern_util.h
    index 83a91f9..35ab97e 100644
    --- a/arch/um/include/shared/kern_util.h
    +++ b/arch/um/include/shared/kern_util.h
    @@ -22,7 +22,8 @@ extern int kmalloc_ok;
    extern unsigned long alloc_stack(int order, int atomic);
    extern void free_stack(unsigned long stack, int order);

    -extern int do_signal(void);
    +struct pt_regs;
    +extern void do_signal(struct pt_regs *regs);
    extern void interrupt_end(void);
    extern void relay_signal(int sig, struct siginfo *si, struct uml_pt_regs *regs);

    diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
    index 68b9119..a6d9226 100644
    --- a/arch/um/kernel/process.c
    +++ b/arch/um/kernel/process.c
    @@ -90,12 +90,14 @@ void *__switch_to(struct task_struct *from, struct task_struct *to)

    void interrupt_end(void)
    {
    + struct pt_regs *regs = &current->thread.regs;
    +
    if (need_resched())
    schedule();
    if (test_thread_flag(TIF_SIGPENDING))
    - do_signal();
    + do_signal(regs);
    if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME))
    - tracehook_notify_resume(&current->thread.regs);
    + tracehook_notify_resume(regs);
    }

    void exit_thread(void)
    diff --git a/arch/um/kernel/signal.c b/arch/um/kernel/signal.c
    index 4f60e4a..57acbd6 100644
    --- a/arch/um/kernel/signal.c
    +++ b/arch/um/kernel/signal.c
    @@ -64,7 +64,7 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs)
    signal_setup_done(err, ksig, singlestep);
    }

    -static int kern_do_signal(struct pt_regs *regs)
    +void do_signal(struct pt_regs *regs)
    {
    struct ksignal ksig;
    int handled_sig = 0;
    @@ -110,10 +110,4 @@ static int kern_do_signal(struct pt_regs *regs)
    */
    if (!handled_sig)
    restore_saved_sigmask();
    - return handled_sig;
    -}
    -
    -int do_signal(void)
    -{
    - return kern_do_signal(&current->thread.regs);
    }
    diff --git a/arch/um/kernel/tlb.c b/arch/um/kernel/tlb.c
    index f1b3eb1..2077248 100644
    --- a/arch/um/kernel/tlb.c
    +++ b/arch/um/kernel/tlb.c
    @@ -291,7 +291,7 @@ void fix_range_common(struct mm_struct *mm, unsigned long start_addr,
    /* We are under mmap_sem, release it such that current can terminate */
    up_write(&current->mm->mmap_sem);
    force_sig(SIGKILL, current);
    - do_signal();
    + do_signal(&current->thread.regs);
    }
    }

    diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c
    index 557232f..d8a9fce 100644
    --- a/arch/um/kernel/trap.c
    +++ b/arch/um/kernel/trap.c
    @@ -173,7 +173,7 @@ static void bad_segv(struct faultinfo fi, unsigned long ip)
    void fatal_sigsegv(void)
    {
    force_sigsegv(SIGSEGV, current);
    - do_signal();
    + do_signal(&current->thread.regs);
    /*
    * This is to tell gcc that we're not returning - do_signal
    * can, in general, return, but in this case, it's not, since

    \
     
     \ /
      Last update: 2015-07-07 13:01    [W:2.469 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site