The following should allow the affected architectures to build in
2.5.19 as currently there will be two definitions of
copy_siginfo_to_user.
Please apply.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/diff -ruN 2.5.19/include/asm-alpha/siginfo.h 2.5.19-si.1/include/asm-alpha/siginfo.h --- 2.5.19/include/asm-alpha/siginfo.h Thu May 30 09:44:38 2002 +++ 2.5.19-si.1/include/asm-alpha/siginfo.h Mon May 27 00:55:05 2002 @@ -6,6 +6,7 @@ #define SIGEV_PAD_SIZE ((SIGEV_MAX_SIZE/sizeof(int)) - 4) #define HAVE_ARCH_COPY_SIGINFO +#define HAVE_ARCH_COPY_SIGINFO_TO_USER #include <asm-generic/siginfo.h> diff -ruN 2.5.19/include/asm-cris/siginfo.h 2.5.19-si.1/include/asm-cris/siginfo.h --- 2.5.19/include/asm-cris/siginfo.h Thu May 30 09:44:38 2002 +++ 2.5.19-si.1/include/asm-cris/siginfo.h Mon May 27 00:55:05 2002 @@ -1,6 +1,8 @@ #ifndef _CRIS_SIGINFO_H #define _CRIS_SIGINFO_H +#define HAVE_ARCH_COPY_SIGINFO_TO_USER + #include <asm-generic/siginfo.h> #endif diff -ruN 2.5.19/include/asm-ia64/siginfo.h 2.5.19-si.1/include/asm-ia64/siginfo.h --- 2.5.19/include/asm-ia64/siginfo.h Thu May 30 09:44:38 2002 +++ 2.5.19-si.1/include/asm-ia64/siginfo.h Mon May 27 00:55:05 2002 @@ -13,6 +13,7 @@ #define HAVE_ARCH_SIGINFO_T #define HAVE_ARCH_COPY_SIGINFO +#define HAVE_ARCH_COPY_SIGINFO_TO_USER #include <asm-generic/siginfo.h> diff -ruN 2.5.19/include/asm-mips64/siginfo.h 2.5.19-si.1/include/asm-mips64/siginfo.h --- 2.5.19/include/asm-mips64/siginfo.h Thu May 30 09:44:38 2002 +++ 2.5.19-si.1/include/asm-mips64/siginfo.h Mon May 27 00:55:05 2002 @@ -13,6 +13,7 @@ #define HAVE_ARCH_SIGINFO_T #define HAVE_ARCH_SIGEVENT_T +#define HAVE_ARCH_COPY_SIGINFO_TO_USER #include <asm-generic/siginfo.h> diff -ruN 2.5.19/include/asm-parisc/siginfo.h 2.5.19-si.1/include/asm-parisc/siginfo.h --- 2.5.19/include/asm-parisc/siginfo.h Thu May 30 09:44:38 2002 +++ 2.5.19-si.1/include/asm-parisc/siginfo.h Mon May 27 00:55:05 2002 @@ -1,6 +1,8 @@ #ifndef _PARISC_SIGINFO_H #define _PARISC_SIGINFO_H +#define HAVE_ARCH_COPY_SIGINFO_TO_USER + #include <asm-generic/siginfo.h> /* diff -ruN 2.5.19/include/asm-sparc/siginfo.h 2.5.19-si.1/include/asm-sparc/siginfo.h --- 2.5.19/include/asm-sparc/siginfo.h Thu May 30 09:44:39 2002 +++ 2.5.19-si.1/include/asm-sparc/siginfo.h Mon May 27 00:55:05 2002 @@ -7,6 +7,7 @@ #define HAVE_ARCH_SIGINFO_T #define HAVE_ARCH_COPY_SIGINFO +#define HAVE_ARCH_COPY_SIGINFO_TO_USER #include <asm-generic/siginfo.h> diff -ruN 2.5.19/include/asm-sparc64/siginfo.h 2.5.19-si.1/include/asm-sparc64/siginfo.h --- 2.5.19/include/asm-sparc64/siginfo.h Thu May 30 09:44:39 2002 +++ 2.5.19-si.1/include/asm-sparc64/siginfo.h Mon May 27 00:55:05 2002 @@ -10,6 +10,7 @@ #define HAVE_ARCH_SIGINFO_T #define HAVE_ARCH_COPY_SIGINFO +#define HAVE_ARCH_COPY_SIGINFO_TO_USER #include <asm-generic/siginfo.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/