From 7e38f4d7213c467eb538430c39d36d8e619d7d56 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@linux.intel.com>
Date: Mon, 23 Apr 2012 16:34:12 -0700
Subject: [PATCH] --- yaml --- r: 299637 b: refs/heads/master c:
 89b8835ec865dddd6673a8dd7003581bf2377176 h: refs/heads/master i:   299635:
 fa4f1919c60a118c93369841b8d540cb02ab379c v: v3

---
 [refs]                               | 2 +-
 trunk/arch/x86/include/asm/siginfo.h | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d06083614470..1ed14f17a79b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d643bdca8ab9cd333da1b68267d0e47328e56f56
+refs/heads/master: 89b8835ec865dddd6673a8dd7003581bf2377176
diff --git a/trunk/arch/x86/include/asm/siginfo.h b/trunk/arch/x86/include/asm/siginfo.h
index fc1aa5535646..34c47b3341c0 100644
--- a/trunk/arch/x86/include/asm/siginfo.h
+++ b/trunk/arch/x86/include/asm/siginfo.h
@@ -2,7 +2,13 @@
 #define _ASM_X86_SIGINFO_H
 
 #ifdef __x86_64__
-# define __ARCH_SI_PREAMBLE_SIZE	(4 * sizeof(int))
+# ifdef __ILP32__ /* x32 */
+typedef long long __kernel_si_clock_t __attribute__((aligned(4)));
+#  define __ARCH_SI_CLOCK_T		__kernel_si_clock_t
+#  define __ARCH_SI_ATTRIBUTES		__attribute__((aligned(8)))
+# else /* x86-64 */
+#  define __ARCH_SI_PREAMBLE_SIZE	(4 * sizeof(int))
+# endif
 #endif
 
 #include <asm-generic/siginfo.h>