[PATCH] compat: introduce compat_time_t

This patch is based on work by Carlos O'Donell and Matthew Wilcox.  It
introduces/updates the compat_time_t type and uses it for compat siginfo
structures.  I have built this on ppc64 and x86_64.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/ia64/ia32/ia32priv.h b/arch/ia64/ia32/ia32priv.h
index b2de948..e3e9290 100644 (file)
--- a/arch/ia64/ia32/ia32priv.h
+++ b/arch/ia64/ia32/ia32priv.h
@@ -241,7 +241,7 @@ typedef struct compat_siginfo {
 
                /* POSIX.1b timers */
                struct {
-                       timer_t _tid;           /* timer id */
+                       compat_timer_t _tid;            /* timer id */
                        int _overrun;           /* overrun count */
                        char _pad[sizeof(unsigned int) - sizeof(int)];
                        compat_sigval_t _sigval;        /* same as below */

diff --git a/arch/s390/kernel/compat_linux.h b/arch/s390/kernel/compat_linux.h
index bf33dcf..3898f66 100644 (file)
--- a/arch/s390/kernel/compat_linux.h
+++ b/arch/s390/kernel/compat_linux.h
@@ -45,7 +45,7 @@ typedef struct compat_siginfo {
 
                /* POSIX.1b timers */
                struct {
-                       timer_t _tid;           /* timer id */
+                       compat_timer_t _tid;            /* timer id */
                        int _overrun;           /* overrun count */
                        compat_sigval_t _sigval;        /* same as below */
                        int _sys_private;       /* not to be passed to user */

diff --git a/arch/sparc64/kernel/signal32.c b/arch/sparc64/kernel/signal32.c
index 9a375e9..f28428f 100644 (file)
--- a/arch/sparc64/kernel/signal32.c
+++ b/arch/sparc64/kernel/signal32.c
@@ -102,7 +102,7 @@ typedef struct compat_siginfo{
 
                /* POSIX.1b timers */
                struct {
-                       timer_t _tid;                   /* timer id */
+                       compat_timer_t _tid;                    /* timer id */
                        int _overrun;                   /* overrun count */
                        compat_sigval_t _sigval;                /* same as below */
                        int _sys_private;               /* not to be passed to user */

diff --git a/include/asm-ia64/compat.h b/include/asm-ia64/compat.h
index cc0ff0a..0c05e5b 100644 (file)
--- a/include/asm-ia64/compat.h
+++ b/include/asm-ia64/compat.h
@@ -27,6 +27,7 @@ typedef u16           compat_ipc_pid_t;
 typedef s32            compat_daddr_t;
 typedef u32            compat_caddr_t;
 typedef __kernel_fsid_t        compat_fsid_t;
+typedef s32            compat_timer_t;
 
 typedef s32            compat_int_t;
 typedef s32            compat_long_t;

diff --git a/include/asm-mips/compat.h b/include/asm-mips/compat.h
index dce9207..d78002a 100644 (file)
--- a/include/asm-mips/compat.h
+++ b/include/asm-mips/compat.h
@@ -29,6 +29,7 @@ typedef s32           compat_caddr_t;
 typedef struct {
        s32     val[2];
 } compat_fsid_t;
+typedef s32            compat_timer_t;
 
 typedef s32            compat_int_t;
 typedef s32            compat_long_t;

diff --git a/include/asm-parisc/compat.h b/include/asm-parisc/compat.h
index ca0eac6..7630d1a 100644 (file)
--- a/include/asm-parisc/compat.h
+++ b/include/asm-parisc/compat.h
@@ -24,7 +24,7 @@ typedef u16   compat_nlink_t;
 typedef u16    compat_ipc_pid_t;
 typedef s32    compat_daddr_t;
 typedef u32    compat_caddr_t;
-typedef u32    compat_timer_t;
+typedef s32    compat_timer_t;
 
 typedef s32    compat_int_t;
 typedef s32    compat_long_t;

diff --git a/include/asm-ppc64/compat.h b/include/asm-ppc64/compat.h
index 09c28d2..12414f5 100644 (file)
--- a/include/asm-ppc64/compat.h
+++ b/include/asm-ppc64/compat.h
@@ -26,6 +26,7 @@ typedef s32           compat_daddr_t;
 typedef u32            compat_caddr_t;
 typedef __kernel_fsid_t        compat_fsid_t;
 typedef s32            compat_key_t;
+typedef s32            compat_timer_t;
 
 typedef s32            compat_int_t;
 typedef s32            compat_long_t;

diff --git a/include/asm-ppc64/ppc32.h b/include/asm-ppc64/ppc32.h
index 1d04048..6b44a8c 100644 (file)
--- a/include/asm-ppc64/ppc32.h
+++ b/include/asm-ppc64/ppc32.h
@@ -32,7 +32,7 @@ typedef struct compat_siginfo {
 
                /* POSIX.1b timers */
                struct {
-                       timer_t _tid;                   /* timer id */
+                       compat_timer_t _tid;                    /* timer id */
                        int _overrun;                   /* overrun count */
                        compat_sigval_t _sigval;                /* same as below */
                        int _sys_private;               /* not to be passed to user */

diff --git a/include/asm-sparc64/compat.h b/include/asm-sparc64/compat.h
index 22f5805..b59122d 100644 (file)
--- a/include/asm-sparc64/compat.h
+++ b/include/asm-sparc64/compat.h
@@ -25,6 +25,7 @@ typedef s32           compat_daddr_t;
 typedef u32            compat_caddr_t;
 typedef __kernel_fsid_t        compat_fsid_t;
 typedef s32            compat_key_t;
+typedef s32            compat_timer_t;
 
 typedef s32            compat_int_t;
 typedef s32            compat_long_t;

diff --git a/include/asm-x86_64/ia32.h b/include/asm-x86_64/ia32.h
index c0a7717..6efa00f 100644 (file)
--- a/include/asm-x86_64/ia32.h
+++ b/include/asm-x86_64/ia32.h
@@ -94,7 +94,7 @@ typedef struct compat_siginfo{
 
                /* POSIX.1b timers */
                struct {
-                       int _tid;               /* timer id */
+                       compat_timer_t _tid;    /* timer id */
                        int _overrun;           /* overrun count */
                        compat_sigval_t _sigval;        /* same as below */
                        int _sys_private;       /* not to be passed to user */