arch/s390/kernel/compat_signal.c:199: error: conflicting types for 'do_sigaction'
include/linux/sched.h:1115: error: previous declaration of 'do_sigaction' was here
Signed-off-by: Dave Jones <[email protected]>
--- linux-2.6.15.noarch/arch/s390/kernel/compat_signal.c~ 2006-02-10 12:47:57.000000000 -0500
+++ linux-2.6.15.noarch/arch/s390/kernel/compat_signal.c 2006-02-10 12:48:05.000000000 -0500
@@ -196,7 +196,7 @@ sys32_sigaction(int sig, const struct ol
}
int
-do_sigaction(int sig, const struct k_sigaction *act, struct k_sigaction *oact);
+do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact);
asmlinkage long
sys32_rt_sigaction(int sig, const struct sigaction32 __user *act,
On Fri, 10 Feb 2006, Dave Jones wrote:
>
> arch/s390/kernel/compat_signal.c:199: error: conflicting types for 'do_sigaction'
> include/linux/sched.h:1115: error: previous declaration of 'do_sigaction' was here
>
> Signed-off-by: Dave Jones <[email protected]>
>
> --- linux-2.6.15.noarch/arch/s390/kernel/compat_signal.c~ 2006-02-10 12:47:57.000000000 -0500
> +++ linux-2.6.15.noarch/arch/s390/kernel/compat_signal.c 2006-02-10 12:48:05.000000000 -0500
> @@ -196,7 +196,7 @@ sys32_sigaction(int sig, const struct ol
> }
>
> int
> -do_sigaction(int sig, const struct k_sigaction *act, struct k_sigaction *oact);
> +do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact);
Umm. Shouldn't we just _remove_ the incorrect and unnecessary
extra declaration?
Linus
arch/s390/kernel/compat_signal.c:199: error: conflicting types for 'do_sigaction'
include/linux/sched.h:1115: error: previous declaration of 'do_sigaction' was here
Signed-off-by: Dave Jones <[email protected]>
--- linux-2.6.15.noarch/arch/s390/kernel/compat_signal.c~ 2006-02-10 12:47:57.000000000 -0500
+++ linux-2.6.15.noarch/arch/s390/kernel/compat_signal.c 2006-02-10 12:48:05.000000000 -0500
@@ -196,7 +196,4 @@ sys32_sigaction(int sig, const struct ol
}
-int
-do_sigaction(int sig, const struct k_sigaction *act, struct k_sigaction *oact);
-
asmlinkage long
sys32_rt_sigaction(int sig, const struct sigaction32 __user *act,
On Fri, Feb 10, 2006 at 04:27:11PM -0500, Dave Jones wrote:
>
> arch/s390/kernel/compat_signal.c:199: error: conflicting types for 'do_sigaction'
> include/linux/sched.h:1115: error: previous declaration of 'do_sigaction' was here
>
> Signed-off-by: Dave Jones <[email protected]>
>
> --- linux-2.6.15.noarch/arch/s390/kernel/compat_signal.c~ 2006-02-10 12:47:57.000000000 -0500
> +++ linux-2.6.15.noarch/arch/s390/kernel/compat_signal.c 2006-02-10 12:48:05.000000000 -0500
> @@ -196,7 +196,4 @@ sys32_sigaction(int sig, const struct ol
> }
>
> -int
> -do_sigaction(int sig, const struct k_sigaction *act, struct k_sigaction *oact);
> -
> asmlinkage long
> sys32_rt_sigaction(int sig, const struct sigaction32 __user *act,
> -
Hmm.. I sent the same patch earlier to Andrew already. To whom should I send
simple compile fixes? I thought I'm supposed to send all patches to Andrew
first?!
Anyway, the patch s390-compat-signal-compile-fix.patch can be removed from
the -mm tree.
Thanks,
Heiko
Heiko Carstens <[email protected]> wrote:
>
> On Fri, Feb 10, 2006 at 04:27:11PM -0500, Dave Jones wrote:
> >
> > arch/s390/kernel/compat_signal.c:199: error: conflicting types for 'do_sigaction'
> > include/linux/sched.h:1115: error: previous declaration of 'do_sigaction' was here
> >
> > Signed-off-by: Dave Jones <[email protected]>
> >
> > --- linux-2.6.15.noarch/arch/s390/kernel/compat_signal.c~ 2006-02-10 12:47:57.000000000 -0500
> > +++ linux-2.6.15.noarch/arch/s390/kernel/compat_signal.c 2006-02-10 12:48:05.000000000 -0500
> > @@ -196,7 +196,4 @@ sys32_sigaction(int sig, const struct ol
> > }
> >
> > -int
> > -do_sigaction(int sig, const struct k_sigaction *act, struct k_sigaction *oact);
> > -
> > asmlinkage long
> > sys32_rt_sigaction(int sig, const struct sigaction32 __user *act,
> > -
>
> Hmm.. I sent the same patch earlier to Andrew already. To whom should I send
> simple compile fixes?
You can copy Linus - sometimes he applies things ;) If not, I'll catch it.
> Anyway, the patch s390-compat-signal-compile-fix.patch can be removed from
> the -mm tree.
That's fine - I'll autodrop it next time I sync with Linus.
I've been a bit sluggish with the s390 patches while waiting for you and
Christoph to sort things out. I'm thinking of holding off on
s390-add-missing-validation-for-dasd-discipline-specific-ioctls.patch and
s390-cleanup-of-dasd-eer-module.patch.
> I've been a bit sluggish with the s390 patches while waiting for you and
> Christoph to sort things out. I'm thinking of holding off on
> s390-add-missing-validation-for-dasd-discipline-specific-ioctls.patch and
> s390-cleanup-of-dasd-eer-module.patch.
Just don't send them for now. I hope the dasd guys here and Christoph will
come to a conclusion on how to go on with this soon.
Thanks,
Heiko