[PATCH 03/12] x86/compat: Move ucontext_x32 to sigframe.h

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Brian Gerst <brgerst@gmail.com>
Newsgroups	linux.kernel
Subject	[PATCH 03/12] x86/compat: Move ucontext_x32 to sigframe.h
Date	Mon, 22 Jun 2015 14:00:02 +0200
Message-ID	<pE8ym-2Mp-15@gated-at.bofh.it> (permalink)
References	<pE8ym-2Mp-5@gated-at.bofh.it>
X-Original-To	x86@kernel.org
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ievXnVhQ+8snEpw5+q4fXpsZ/pt3fBDU8CUHMZn+2hg=; b=pu4c8ZSuvOw+ekg9NSf7rzXhDBI/msD6XjqzPxHWEvtpUnfEZsWebz9ldkc6CQdzi7 Q2Jw9iSQtSgY4g0YjT0gZZTyVgyvxqA9G7i8ZqFjlcRe6p9RurdmmfYFjQh9zTrrhdEq o9juKIL2xhaKK3QatypJWhbgPvSWP0dS6taBtF/sztyjhr32A4d+wsA6JBzKT6qGqTwy zAb4cnxnRVeBH3Ybo6Abo3177Mn3hYIXwjsYUwCJaZSex+oY8nUvWsIOLqhApXuG7Nbf CbhKDOWOLxrSqT5gcDQ53Sqt6eZXemKvSmib1W0/+CYIogRsszt+bSBMCnxz5tb3t3WS kiJg==
X-Received	by 10.170.71.65 with SMTP id n62mr2347905ykn.29.1434974143805; Mon, 22 Jun 2015 04:55:43 -0700 (PDT)
X-Mailer	git-send-email 2.1.0
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	62
Organization	linux.* mail to news gateway
X-Original-Cc	linux-kernel@vger.kernel.org, Ingo Molnar <mingo@kernel.org>, "H. Peter Anvin" <hpa@zytor.com>, Denys Vlasenko <dvlasenk@redhat.com>, Andy Lutomirski <luto@amacapital.net>
X-Original-Date	Mon, 22 Jun 2015 07:55:12 -0400
X-Original-Message-ID	<1434974121-32575-4-git-send-email-brgerst@gmail.com>
X-Original-References	<1434974121-32575-1-git-send-email-brgerst@gmail.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	aioe.org linux.kernel:1169873

Show key headers only | View raw

ia32.h should only contain the code for 32-bit compatability.

Signed-off-by: Brian Gerst <brgerst@gmail.com>
---
 arch/x86/include/asm/ia32.h     |  9 ---------
 arch/x86/include/asm/sigframe.h | 10 ++++++++++
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/arch/x86/include/asm/ia32.h b/arch/x86/include/asm/ia32.h
index d0e8e01..2801976 100644
--- a/arch/x86/include/asm/ia32.h
+++ b/arch/x86/include/asm/ia32.h
@@ -22,15 +22,6 @@ struct ucontext_ia32 {
 	compat_sigset_t	  uc_sigmask;	/* mask last for extensibility */
 };
 
-struct ucontext_x32 {
-	unsigned int	  uc_flags;
-	unsigned int 	  uc_link;
-	compat_stack_t	  uc_stack;
-	unsigned int	  uc__pad0;     /* needed for alignment */
-	struct sigcontext uc_mcontext;  /* the 64-bit sigcontext type */
-	compat_sigset_t	  uc_sigmask;	/* mask last for extensibility */
-};
-
 /* This matches struct stat64 in glibc2.2, hence the absolutely
  * insane amounts of padding around dev_t's.
  */
diff --git a/arch/x86/include/asm/sigframe.h b/arch/x86/include/asm/sigframe.h
index 7c7c27c..1f3175b 100644
--- a/arch/x86/include/asm/sigframe.h
+++ b/arch/x86/include/asm/sigframe.h
@@ -4,6 +4,7 @@
 #include <asm/sigcontext.h>
 #include <asm/siginfo.h>
 #include <asm/ucontext.h>
+#include <linux/compat.h>
 
 #ifdef CONFIG_X86_32
 #define sigframe_ia32		sigframe
@@ -69,6 +70,15 @@ struct rt_sigframe {
 
 #ifdef CONFIG_X86_X32_ABI
 
+struct ucontext_x32 {
+	unsigned int	  uc_flags;
+	unsigned int 	  uc_link;
+	compat_stack_t	  uc_stack;
+	unsigned int	  uc__pad0;     /* needed for alignment */
+	struct sigcontext uc_mcontext;  /* the 64-bit sigcontext type */
+	compat_sigset_t	  uc_sigmask;	/* mask last for extensibility */
+};
+
 struct rt_sigframe_x32 {
 	u64 pretcode;
 	struct ucontext_x32 uc;
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 03/12] x86/compat: Move ucontext_x32 to sigframe.h Brian Gerst <brgerst@gmail.com> - 2015-06-22 14:00 +0200

csiph-web