Messages in this thread Patch in this message | | | Date | Wed, 24 Oct 2012 10:08:35 +0200 | From | Richard Weinberger <> | Subject | Re: [REGRESSION] uml: signal.c build errors |
| |
On 24.10.2012 01:18, Matthew Leach wrote: > Hi, > > When building UML against 3.7-rc2 I encounter the following build error: > > # make ARCH=uml > scripts/kconfig/conf --silentoldconfig arch/x86/um/Kconfig > CHK include/generated/uapi/linux/version.h > UPD include/generated/uapi/linux/version.h > WRAP arch/um/include/generated/asm/clkdev.h > SYSHDR arch/x86/syscalls/../include/generated/uapi/asm/unistd_32.h > SYSHDR arch/x86/syscalls/../include/generated/uapi/asm/unistd_64.h > SYSHDR arch/x86/syscalls/../include/generated/uapi/asm/unistd_x32.h > > ... > > CC arch/um/os-Linux/signal.o > arch/um/os-Linux/signal.c:18:8: error: conflicting types for ‘sig_info’ > In file included from arch/um/os-Linux/signal.c:12:0: > /home/matthew/Development/linux/arch/um/include/shared/as-layout.h:64:15: note: previous declaration of ‘sig_info’ was here > arch/um/os-Linux/signal.c:19:2: warning: initialization from incompatible pointer type [enabled by default] > arch/um/os-Linux/signal.c:19:2: warning: (near initialization for ‘sig_info[5]’) [enabled by default] > arch/um/os-Linux/signal.c:20:2: warning: initialization from incompatible pointer type [enabled by default] > arch/um/os-Linux/signal.c:20:2: warning: (near initialization for ‘sig_info[8]’) [enabled by default] > arch/um/os-Linux/signal.c:21:2: warning: initialization from incompatible pointer type [enabled by default] > arch/um/os-Linux/signal.c:21:2: warning: (near initialization for ‘sig_info[4]’) [enabled by default] > arch/um/os-Linux/signal.c:22:2: warning: initialization from incompatible pointer type [enabled by default] > arch/um/os-Linux/signal.c:22:2: warning: (near initialization for ‘sig_info[28]’) [enabled by default] > arch/um/os-Linux/signal.c:23:2: warning: initialization from incompatible pointer type [enabled by default] > arch/um/os-Linux/signal.c:23:2: warning: (near initialization for ‘sig_info[7]’) [enabled by default] > arch/um/os-Linux/signal.c:24:2: warning: initialization from incompatible pointer type [enabled by default] > arch/um/os-Linux/signal.c:24:2: warning: (near initialization for ‘sig_info[11]’) [enabled by default] > arch/um/os-Linux/signal.c:25:2: warning: initialization from incompatible pointer type [enabled by default] > arch/um/os-Linux/signal.c:25:2: warning: (near initialization for ‘sig_info[29]’) [enabled by default] > arch/um/os-Linux/signal.c:26:2: warning: initialization from incompatible pointer type [enabled by default] > arch/um/os-Linux/signal.c:26:2: warning: (near initialization for ‘sig_info[26]’) [enabled by default] > arch/um/os-Linux/signal.c:133:1: warning: initialization from incompatible pointer type [enabled by default] > arch/um/os-Linux/signal.c:133:1: warning: (near initialization for ‘handlers[26]’) [enabled by default] > make[1]: *** [arch/um/os-Linux/signal.o] Error 1 > make: *** [arch/um/os-Linux] Error 2 > > I have tracked this down to [1] where, indeed, the type of sig_info is > different; the second parameter in signal.c is 'siginfo_t' where as in > as-layout.h the second parameter's type is declared as 'struct siginfo'. > > [1]: d3c1cfcdb43e023ab1b1c7a555cd9e929026500a
Does this patch fix the issue? Are you using glibc 2.17?
Thanks, //richard
--- diff --git a/arch/um/include/shared/as-layout.h b/arch/um/include/shared/as-layout.h index 694c792..48fcbb0 100644 --- a/arch/um/include/shared/as-layout.h +++ b/arch/um/include/shared/as-layout.h @@ -60,9 +60,6 @@ extern unsigned long host_task_size;
extern int linux_main(int argc, char **argv);
-struct siginfo; -extern void (*sig_info[])(int, struct siginfo *si, struct uml_pt_regs *); - #endif
#endif diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c index 4625949..3a72936 100644 --- a/arch/um/os-Linux/skas/process.c +++ b/arch/um/os-Linux/skas/process.c @@ -23,6 +23,9 @@ #include <skas_ptrace.h> #include <sysdep/stub.h>
+#include <signal.h> +extern void (*sig_info[NSIG])(int, siginfo_t *, struct uml_pt_regs *); + int is_skas_winch(int pid, int fd, void *data) { return pid == getpgrp(); -- 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/
| |