--- /usr/include/asm-ppc64/signal.h.bork	2005-09-10 14:27:15.000000000 +0000
+++ /usr/include/asm-ppc64/signal.h	2005-09-11 08:47:06.000000000 +0000
@@ -8,6 +8,7 @@
 /* Avoid too many header ordering problems.  */
 struct siginfo;
 
+#ifdef __KERNEL__
 #define _NSIG		64
 #define _NSIG_BPW	64
 #define _NSIG_WORDS	(_NSIG / _NSIG_BPW)
@@ -18,6 +19,16 @@
 	unsigned long sig[_NSIG_WORDS];
 } sigset_t;
 
+#else
+
+#define NSIG            32
+#ifndef __sigset_t_defined
+typedef unsigned long sigset_t;
+
+#endif
+
+#endif /* __KERNEL__ */
+
 #define SIGHUP		 1
 #define SIGINT		 2
 #define SIGQUIT		 3
@@ -96,6 +107,8 @@
 
 #define MINSIGSTKSZ	2048
 #define SIGSTKSZ	8192
+
+
 #ifdef __KERNEL__
 
 /*
@@ -126,6 +139,8 @@
 #define SIG_IGN	((__sighandler_t)1)	/* ignore signal */
 #define SIG_ERR	((__sighandler_t)-1)	/* error return from signal */
 
+
+#ifdef __KERNEL__
 struct old_sigaction {
 	__sighandler_t sa_handler;
 	old_sigset_t sa_mask;
@@ -144,16 +159,40 @@
 	struct sigaction sa;
 };
 
+#else
+
+#ifndef _SIGNAL_H
+struct sigaction {
+        union {
+          __sighandler_t _sa_handler;
+          void (*_sa_sigaction)(int, struct siginfo *, void *);
+        } _u;
+	sigset_t sa_mask;
+	unsigned long sa_flags;
+	void (*sa_restorer)(void);
+};
+#endif
+
+#define sa_handler      _u._sa_handler
+#define sa_sigaction    _u._sa_sigaction
+
+#endif /* __KERNEL */
+
+#ifndef _SIGNAL_H
 typedef struct sigaltstack {
 	void __user *ss_sp;
 	int ss_flags;
 	size_t ss_size;
 } stack_t;
+#endif
 
+#ifdef __KERNEL__
 struct pt_regs;
 struct timespec;
 extern int do_signal(sigset_t *oldset, struct pt_regs *regs);
 extern int do_signal32(sigset_t *oldset, struct pt_regs *regs);
 #define ptrace_signal_deliver(regs, cookie) do { } while (0)
 
+#endif /* __KERNEL__ */
+
 #endif /* _ASMPPC64_SIGNAL_H */