I suppose one could argue that such functions should be in
signal.c, but save for this signal issue the code is
common. Seems a waste to support the same code in N
platforms.
-g
Stephen Rothwell wrote:
>
> Hi Linus,
>
> This patch makes do_signal static in arch/i386/kernel/signal.c which
> means its declaration can be removed from asm-i386/signal.h which may
> help Jeff out with UML.
>
> I am not sure whether we need the FASTCALL() or whether the change
> in the comment in asm-um/signal.h makes sense. (Does UML work on
> x86_64, yet?)
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
> diff -ruN 2.5.41-1.715/arch/i386/kernel/signal.c 2.5.41-1.715-si.1/arch/i386/kernel/signal.c
> --- 2.5.41-1.715/arch/i386/kernel/signal.c 2002-10-02 11:23:54.000000000 +1000
> +++ 2.5.41-1.715-si.1/arch/i386/kernel/signal.c 2002-10-09 17:52:15.000000000 +1000
> @@ -27,6 +27,8 @@
>
> #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
>
> +static int FASTCALL(do_signal(struct pt_regs *regs, sigset_t *oldset));
> +
> /*
> * Atomically swap in the new signal mask, and wait for a signal.
> */
> @@ -545,7 +547,7 @@
> * want to handle. Thus you cannot kill init even with a SIGKILL even by
> * mistake.
> */
> -int do_signal(struct pt_regs *regs, sigset_t *oldset)
> +static int do_signal(struct pt_regs *regs, sigset_t *oldset)
> {
> siginfo_t info;
> int signr;
> diff -ruN 2.5.41-1.715/include/asm-i386/signal.h 2.5.41-1.715-si.1/include/asm-i386/signal.h
> --- 2.5.41-1.715/include/asm-i386/signal.h 2002-01-31 07:12:46.000000000 +1100
> +++ 2.5.41-1.715-si.1/include/asm-i386/signal.h 2002-10-09 17:54:28.000000000 +1000
> @@ -2,7 +2,6 @@
> #define _ASMi386_SIGNAL_H
>
> #include <linux/types.h>
> -#include <linux/linkage.h>
>
> /* Avoid too many header ordering problems. */
> struct siginfo;
> @@ -217,9 +216,6 @@
> return word;
> }
>
> -struct pt_regs;
> -extern int FASTCALL(do_signal(struct pt_regs *regs, sigset_t *oldset));
> -
> #endif /* __KERNEL__ */
>
> #endif
> diff -ruN 2.5.41-1.715/include/asm-um/signal.h 2.5.41-1.715-si.1/include/asm-um/signal.h
> --- 2.5.41-1.715/include/asm-um/signal.h 2002-09-16 13:40:57.000000000 +1000
> +++ 2.5.41-1.715-si.1/include/asm-um/signal.h 2002-10-09 17:56:20.000000000 +1000
> @@ -6,7 +6,7 @@
> #ifndef __UM_SIGNAL_H
> #define __UM_SIGNAL_H
>
> -/* Need to kill the do_signal() declaration in the i386 signal.h */
> +/* Need to kill the do_signal() declaration in the x86_64 signal.h */
>
> #define do_signal do_signal_renamed
> #include "asm/arch/signal.h"
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
-- George Anzinger george@mvista.com High-res-timers: http://sourceforge.net/projects/high-res-timers/ Preemption patch: http://www.kernel.org/pub/linux/kernel/people/rml - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/