diff options
Diffstat (limited to 'include/asm-m68k/siginfo.h')
| -rw-r--r-- | include/asm-m68k/siginfo.h | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/include/asm-m68k/siginfo.h b/include/asm-m68k/siginfo.h index 2a5782905..6b48063af 100644 --- a/include/asm-m68k/siginfo.h +++ b/include/asm-m68k/siginfo.h @@ -23,8 +23,9 @@ typedef struct siginfo { /* kill() */ struct { - pid_t _pid; /* sender's pid */ - uid_t _uid; /* sender's uid */ + __kernel_pid_t _pid; /* sender's pid */ + __kernel_uid_t _uid; /* backwards compatibility */ + __kernel_uid32_t _uid32; /* sender's uid */ } _kill; /* POSIX.1b timers */ @@ -35,18 +36,20 @@ typedef struct siginfo { /* POSIX.1b signals */ struct { - pid_t _pid; /* sender's pid */ - uid_t _uid; /* sender's uid */ + __kernel_pid_t _pid; /* sender's pid */ + __kernel_uid_t _uid; /* backwards compatibility */ sigval_t _sigval; + __kernel_uid32_t _uid32; /* sender's uid */ } _rt; /* SIGCHLD */ struct { - pid_t _pid; /* which child */ - uid_t _uid; /* sender's uid */ + __kernel_pid_t _pid; /* which child */ + __kernel_uid_t _uid; /* backwards compatibility */ int _status; /* exit code */ clock_t _utime; clock_t _stime; + __kernel_uid32_t _uid32; /* sender's uid */ } _sigchld; /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */ @@ -62,11 +65,18 @@ typedef struct siginfo { } _sifields; } siginfo_t; +#define UID16_SIGINFO_COMPAT_NEEDED + /* * How these fields are to be accessed. */ #define si_pid _sifields._kill._pid +#ifdef __KERNEL__ +#define si_uid _sifields._kill._uid32 +#define si_uid16 _sifields._kill._uid +#else #define si_uid _sifields._kill._uid +#endif /* __KERNEL__ */ #define si_status _sifields._sigchld._status #define si_utime _sifields._sigchld._utime #define si_stime _sifields._sigchld._stime |