vserver 2.0 rc7

[linux-2.6.git] / arch / ia64 / ia32 / ia32priv.h

diff --git a/arch/ia64/ia32/ia32priv.h b/arch/ia64/ia32/ia32priv.h
index 59c500b..b2de948 100644 (file)
--- a/arch/ia64/ia32/ia32priv.h
+++ b/arch/ia64/ia32/ia32priv.h
@@ -225,14 +225,7 @@ struct stat64 {
        unsigned int    st_ino_hi;
 };
 
-typedef union sigval32 {
-       int sival_int;
-       unsigned int sival_ptr;
-} sigval_t32;
-
-#define SIGEV_PAD_SIZE32 ((SIGEV_MAX_SIZE/sizeof(int)) - 3)
-
-typedef struct siginfo32 {
+typedef struct compat_siginfo {
        int si_signo;
        int si_errno;
        int si_code;
@@ -251,7 +244,7 @@ typedef struct siginfo32 {
                        timer_t _tid;           /* timer id */
                        int _overrun;           /* overrun count */
                        char _pad[sizeof(unsigned int) - sizeof(int)];
-                       sigval_t32 _sigval;     /* same as below */
+                       compat_sigval_t _sigval;        /* same as below */
                        int _sys_private;       /* not to be passed to user */
                } _timer;
 
@@ -259,7 +252,7 @@ typedef struct siginfo32 {
                struct {
                        unsigned int _pid;      /* sender's pid */
                        unsigned int _uid;      /* sender's uid */
-                       sigval_t32 _sigval;
+                       compat_sigval_t _sigval;
                } _rt;
 
                /* SIGCHLD */
@@ -282,20 +275,7 @@ typedef struct siginfo32 {
                        int _fd;
                } _sigpoll;
        } _sifields;
-} siginfo_t32;
-
-typedef struct sigevent32 {
-       sigval_t32 sigev_value;
-       int sigev_signo;
-       int sigev_notify;
-       union {
-               int _pad[SIGEV_PAD_SIZE32];
-               struct {
-                       u32 _function;
-                       u32 _attribute; /* really pthread_attr_t */
-               } _sigev_thread;
-       } _sigev_un;
-} sigevent_t32;
+} compat_siginfo_t;
 
 struct old_linux32_dirent {
        u32     d_ino;