Skip to contentSkip to conversation

Fix s390 build failure.

PATCH Dave Jones 4 participants 6 messages Feb 10, 2006 – Feb 11, 2006 s390

lore
Share & tools
lore

Dave Jones

author
#0 lore raw

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

arch/s390/kernel/compat_signal.c renamed from arch/s390/kernel/compat_signal.c~ +1 -1
@@ -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,
#1 lore raw
Quoted 9 lines · Dave Jones

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

arch/s390/kernel/compat_signal.c sys32_sigaction(int sig, const struct ol · line 199

Quoted 5 lines
arch/s390/kernel/compat_signal.c renamed from arch/s390/kernel/compat_signal.c~ +1 -1
@@ -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

author
#2 lore raw

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

arch/s390/kernel/compat_signal.c renamed from arch/s390/kernel/compat_signal.c~ +0 -3
@@ -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,
#3 lore raw
Quoted 9 lines · Dave Jones

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

arch/s390/kernel/compat_signal.c sys32_sigaction(int sig, const struct ol

Quoted 8 lines
arch/s390/kernel/compat_signal.c renamed from arch/s390/kernel/compat_signal.c~ +0 -4
@@ -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

#4 lore raw
Quoted 13 lines · Heiko Carstens
Quoted 11 lines · Dave Jones

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

arch/s390/kernel/compat_signal.c renamed from arch/s390/kernel/compat_signal.c~ +0 -0
@@ -196,7 +196,4 @@ sys32_sigaction(int sig, const struct ol
 }
 
Quoted 9 lines

arch/s390/kernel/compat_signal.c sys32_sigaction(int sig, const struct ol

Quoted 6 lines
arch/s390/kernel/compat_signal.c renamed from arch/s390/kernel/compat_signal.c~ +0 -4
-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.

Quoted 2 lines

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.

#5 lore raw
Quoted 4 lines

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