---
25-akpm/include/asm-ppc64/compat.h | 1
25-akpm/include/asm-ppc64/ppc32.h | 64 -------------------------------------
2 files changed, 2 insertions(+), 63 deletions(-)
diff -puN include/asm-ppc64/compat.h~compat-signal-ppc64-2004-01-29 include/asm-ppc64/compat.h
--- 25/include/asm-ppc64/compat.h~compat-signal-ppc64-2004-01-29 Thu Jan 29 15:21:36 2004
+++ 25-akpm/include/asm-ppc64/compat.h Thu Jan 29 15:21:36 2004
@@ -25,6 +25,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 u32 compat_timer_t;
typedef s32 compat_int_t;
typedef s32 compat_long_t;
diff -puN include/asm-ppc64/ppc32.h~compat-signal-ppc64-2004-01-29 include/asm-ppc64/ppc32.h
--- 25/include/asm-ppc64/ppc32.h~compat-signal-ppc64-2004-01-29 Thu Jan 29 15:21:36 2004
+++ 25-akpm/include/asm-ppc64/ppc32.h Thu Jan 29 15:21:36 2004
@@ -2,6 +2,7 @@
#define _PPC64_PPC32_H
#include <linux/compat.h>
+#include <linux/compat_siginfo.h>
#include <asm/siginfo.h>
#include <asm/signal.h>
@@ -40,55 +41,6 @@
/* These are here to support 32-bit syscalls on a 64-bit kernel. */
-typedef struct compat_siginfo {
- int si_signo;
- int si_errno;
- int si_code;
-
- union {
- int _pad[SI_PAD_SIZE32];
-
- /* kill() */
- struct {
- compat_pid_t _pid; /* sender's pid */
- compat_uid_t _uid; /* sender's uid */
- } _kill;
-
- /* POSIX.1b timers */
- struct {
- unsigned int _timer1;
- unsigned int _timer2;
- } _timer;
-
- /* POSIX.1b signals */
- struct {
- compat_pid_t _pid; /* sender's pid */
- compat_uid_t _uid; /* sender's uid */
- compat_sigval_t _sigval;
- } _rt;
-
- /* SIGCHLD */
- struct {
- compat_pid_t _pid; /* which child */
- compat_uid_t _uid; /* sender's uid */
- int _status; /* exit code */
- compat_clock_t _utime;
- compat_clock_t _stime;
- } _sigchld;
-
- /* SIGILL, SIGFPE, SIGSEGV, SIGBUS, SIGEMT */
- struct {
- unsigned int _addr; /* faulting insn/memory ref. */
- } _sigfault;
-
- /* SIGPOLL */
- struct {
- int _band; /* POLL_IN, POLL_OUT, POLL_MSG */
- int _fd;
- } _sigpoll;
- } _sifields;
-} compat_siginfo_t;
-
#define __old_sigaction32 old_sigaction32
struct __old_sigaction32 {
@@ -141,20 +93,6 @@ struct ucontext32 {
struct mcontext32 uc_mcontext;
};
-typedef struct compat_sigevent {
- compat_sigval_t sigev_value;
- int sigev_signo;
- int sigev_notify;
- union {
- int _pad[SIGEV_PAD_SIZE];
- int _tid;
- struct {
- compat_uptr_t _function;
- compat_uptr_t _attribute;
- } _sigev_thread;
- } _sigev_un;
-} compat_sigevent_t;
-
struct ipc_kludge_32 {
unsigned int msgp;
int msgtyp;
_