powerpc: merge ucontext.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

diff --git a/include/asm-powerpc/ucontext.h b/include/asm-powerpc/ucontext.h
new file mode 100644 (file)
index 0000000..d9a4ddf
--- /dev/null
+++ b/include/asm-powerpc/ucontext.h
@@ -0,0 +1,40 @@
+#ifndef _ASM_POWERPC_UCONTEXT_H
+#define _ASM_POWERPC_UCONTEXT_H
+
+#ifdef __powerpc64__
+#include <asm/sigcontext.h>
+#else
+#include <asm/elf.h>
+#endif
+#include <asm/signal.h>
+
+#ifndef __powerpc64__
+struct mcontext {
+       elf_gregset_t   mc_gregs;
+       elf_fpregset_t  mc_fregs;
+       unsigned long   mc_pad[2];
+       elf_vrregset_t  mc_vregs __attribute__((__aligned__(16)));
+};
+#endif
+
+struct ucontext {
+       unsigned long   uc_flags;
+       struct ucontext __user *uc_link;
+       stack_t         uc_stack;
+#ifndef __powerpc64__
+       int             uc_pad[7];
+       struct mcontext __user *uc_regs;/* points to uc_mcontext field */
+#endif
+       sigset_t        uc_sigmask;
+       /* glibc has 1024-bit signal masks, ours are 64-bit */
+#ifdef __powerpc64__
+       sigset_t        __unused[15];   /* Allow for uc_sigmask growth */
+       struct sigcontext uc_mcontext;  /* last for extensibility */
+#else
+       int             uc_maskext[30];
+       int             uc_pad2[3];
+       struct mcontext uc_mcontext;
+#endif
+};
+
+#endif /* _ASM_POWERPC_UCONTEXT_H */

diff --git a/include/asm-ppc/ucontext.h b/include/asm-ppc/ucontext.h
deleted file mode 100644 (file)
index 664bc98..0000000
--- a/include/asm-ppc/ucontext.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _ASMPPC_UCONTEXT_H
-#define _ASMPPC_UCONTEXT_H
-
-#include <asm/elf.h>
-#include <asm/signal.h>
-
-struct mcontext {
-       elf_gregset_t   mc_gregs;
-       elf_fpregset_t  mc_fregs;
-       unsigned long   mc_pad[2];
-       elf_vrregset_t  mc_vregs __attribute__((__aligned__(16)));
-};
-
-struct ucontext {
-       unsigned long    uc_flags;
-       struct ucontext __user *uc_link;
-       stack_t          uc_stack;
-       int              uc_pad[7];
-       struct mcontext __user *uc_regs;/* points to uc_mcontext field */
-       sigset_t         uc_sigmask;
-       /* glibc has 1024-bit signal masks, ours are 64-bit */
-       int              uc_maskext[30];
-       int              uc_pad2[3];
-       struct mcontext  uc_mcontext;
-};
-
-#endif /* !_ASMPPC_UCONTEXT_H */

diff --git a/include/asm-ppc64/ucontext.h b/include/asm-ppc64/ucontext.h
deleted file mode 100644 (file)
index ef8cc5b..0000000
--- a/include/asm-ppc64/ucontext.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef _ASMPPC64_UCONTEXT_H
-#define _ASMPPC64_UCONTEXT_H
-
-#include <asm/sigcontext.h>
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-struct ucontext {
-       unsigned long     uc_flags;
-       struct ucontext  *uc_link;
-       stack_t           uc_stack;
-       sigset_t          uc_sigmask;
-       sigset_t          __unsued[15]; /* Allow for uc_sigmask growth */
-       struct sigcontext uc_mcontext;  /* last for extensibility */
-};
-
-#endif /* _ASMPPC64_UCONTEXT_H */