[parisc-linux-cvs] linux-2.6 carlos

[Carlos O'Donell]

On Mon, Sep 27, 2004 at 03:16:40PM -0600, Carlos O'Donell wrote:
> CVSROOT:	/var/cvs
> Module name:	linux-2.6
> Changes by:	carlos	04/09/27 15:16:40
> 
> Modified files:
> 	include/asm-ia64: compat.h compat_siginfo.h 
> 
> Log message:
> ia64 should use a 32-bit compat uid when defining a compat
> siginfo structure. This will allow ia64 to build out of the
> parisc tree again.
> 
> * include/asm-ia64/compat.h: Set the siginfo compat
> uid to a 32-bit value.
> * include/asm-ia64/compat_siginfo.h: Removed.

This should have ia64 building properly out of our tree with the siginfo
compat changes.

Index: include/asm-ia64/compat.h
===================================================================
RCS file: /var/cvs/linux-2.6/include/asm-ia64/compat.h,v
retrieving revision 1.4
diff -u -p -r1.4 compat.h
--- include/asm-ia64/compat.h	16 Mar 2004 15:40:37 -0000	1.4
+++ include/asm-ia64/compat.h	27 Sep 2004 21:13:48 -0000
@@ -15,6 +15,9 @@ typedef s32		compat_key_t;
 typedef s32		compat_pid_t;
 typedef u16		compat_uid_t;
 typedef u16		compat_gid_t;
+/* Define for use in compat_siginfo_t */
+#undef __ARCH_SI_COMPAT_UID_T
+#define __ARCH_SI_COMPAT_UID_T	compat_uid32_t
 typedef u32		compat_uid32_t;
 typedef u32		compat_gid32_t;
 typedef u16		compat_mode_t;
Index: include/asm-ia64/compat_siginfo.h
===================================================================
RCS file: /var/cvs/linux-2.6/include/asm-ia64/compat_siginfo.h,v
retrieving revision 1.1
diff -u -p -r1.1 compat_siginfo.h
--- include/asm-ia64/compat_siginfo.h	18 Dec 2003 21:37:20 -0000	1.1
+++ include/asm-ia64/compat_siginfo.h	27 Sep 2004 21:13:48 -0000
@@ -1,2 +0,0 @@
-/* We use the generic compat struct */
-#include <asm-generic/compat_siginfo.h>