[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 b2de948bdaea79b138b6cf8472729e3c435befef..e3e9290e3ff2f433f649daa418a2c35a0c00ed5e 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 bf33dcfec7dbdb5651bfa138c46456583ebc68a6..3898f66d0b2fb26eb905745acadc9c155a1706b4 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 9a375e975cffbdcc0d6e2403addf7e203459b2e5..f28428f4170e67449259ce79e6a6ab1b0da6b2ca 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 cc0ff0a4bdd07d33b93966b9e9eff89bceeda725..0c05e5bad8a0fe01e4ba88abcb84d1516014d414 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 dce92079e7fc4e70c64177c86d47ce36fb34ee52..d78002afb1e12927f080b13f930da9006d698ed1 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 ca0eac647a05bd96dec5385b3c043a8f1bcc1375..7630d1ad2391ada9799226cb13eadaf5fc3edf63 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 09c28d28ce6c61105e3688a52bf4d57d2e06f649..12414f5fc666b00a13c433aa42326127e93c168b 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 1d0404897550ba5d8ac72919c5e3370bf4935e9d..6b44a8caf39564db93bce628b5eee68f859182cf 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 22f58055b8abb5cd412f89412a023e392cc615a8..b59122dd176dd0583fd7a1a60b0cb0303927f73c 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 c0a7717923ed69410184d1380daa3baf93840e09..6efa00fe4e7be71d3404d52f305aabe3b8e4ea0c 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 */