From f80bcd7c911812b1627039bb9ea580769a591610 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Sun, 19 Feb 2012 07:50:12 -0800
Subject: [PATCH] --- yaml --- r: 297726 b: refs/heads/master c:
 9d3897630e14b3d33bcb24a3c0fa9d60a01d3058 h: refs/heads/master v: v3

---
 [refs]                                |  2 +-
 trunk/arch/x86/include/asm/sigframe.h | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bb77d4e846f4..65ad62d68b66 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4048e2a8d4b491a69bf47ceda12cc0c0b924f6b8
+refs/heads/master: 9d3897630e14b3d33bcb24a3c0fa9d60a01d3058
diff --git a/trunk/arch/x86/include/asm/sigframe.h b/trunk/arch/x86/include/asm/sigframe.h
index 4e0fe26d27d3..7c7c27c97daa 100644
--- a/trunk/arch/x86/include/asm/sigframe.h
+++ b/trunk/arch/x86/include/asm/sigframe.h
@@ -59,12 +59,25 @@ struct rt_sigframe_ia32 {
 #endif /* defined(CONFIG_X86_32) || defined(CONFIG_IA32_EMULATION) */
 
 #ifdef CONFIG_X86_64
+
 struct rt_sigframe {
 	char __user *pretcode;
 	struct ucontext uc;
 	struct siginfo info;
 	/* fp state follows here */
 };
+
+#ifdef CONFIG_X86_X32_ABI
+
+struct rt_sigframe_x32 {
+	u64 pretcode;
+	struct ucontext_x32 uc;
+	compat_siginfo_t info;
+	/* fp state follows here */
+};
+
+#endif /* CONFIG_X86_X32_ABI */
+
 #endif /* CONFIG_X86_64 */
 
 #endif /* _ASM_X86_SIGFRAME_H */