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 <[email protected]>
Signed-off-by: Andy Lutomirski <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Andy Lutomirski <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Brian Gerst <[email protected]>
Cc: Denys Vlasenko <[email protected]>
Cc: Denys Vlasenko <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: H. Peter Anvin <[email protected]>
Cc: Kees Cook <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Oleg Nesterov <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Richard Weinberger <[email protected]>
Cc: Rik van Riel <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: [email protected]
Link: http://lkml.kernel.org/r/67c57eac09a589bac3c6c5ff22f9623ec55a184a.1435952415.git.luto@kernel.org
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/arch/um/include/shared/kern_util.h b/arch/um/include/shared/kern_util.h
index 83a91f9763302a5fca9b1516fbc958f05adfd9e9..35ab97e4bb9b5f79aae8fefacf046e1cca541d24 100644 (file)
--- 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 68b9119841cddb5153c606ee431dbc65f8ac7db1..a6d922672b9f36b5f6e9d07a959c48e2751dcab5 100644 (file)
--- 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 4f60e4aad79091aed4f1f09b2e4d4288e0074cd8..57acbd67d85dbd4051cd3c534ceff2a300ce9906 100644 (file)
--- 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 f1b3eb14b855ccd8740b328085521c0b432407d2..2077248e8a7213e928ebf0fdc38179a8990f9d2c 100644 (file)
--- 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 557232f758b61efe00462df9766f5a16e08ebbd3..d8a9fce6ee2e5b10a63405654c3958c7361951fe 100644 (file)
--- 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