From baf98d39a84753382fc8aa16cb38c21498c6a259 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Tue, 14 Feb 2012 13:13:21 -0800
Subject: [PATCH] --- yaml --- r: 297705 b: refs/heads/master c:
 1f5e27a90add2fe2a1c11508f68d377e3ddcf9ab h: refs/heads/master i:   297703:
 729d7678bfd110cb6d0f0e270901e01c5807a624 v: v3

---
 [refs]                                       |  2 +-
 trunk/arch/x86/include/asm/Kbuild            |  1 +
 trunk/arch/x86/include/asm/posix_types.h     |  4 +++-
 trunk/arch/x86/include/asm/posix_types_x32.h | 19 +++++++++++++++++++
 4 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 trunk/arch/x86/include/asm/posix_types_x32.h

diff --git a/[refs] b/[refs]
index 34d869ea91dc..84edea176ce8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afead38d011ab2f333d12ebb6752ed9baa53b667
+refs/heads/master: 1f5e27a90add2fe2a1c11508f68d377e3ddcf9ab
diff --git a/trunk/arch/x86/include/asm/Kbuild b/trunk/arch/x86/include/asm/Kbuild
index b57e6a43a37a..986954fb9513 100644
--- a/trunk/arch/x86/include/asm/Kbuild
+++ b/trunk/arch/x86/include/asm/Kbuild
@@ -14,6 +14,7 @@ header-y += msr.h
 header-y += mtrr.h
 header-y += posix_types_32.h
 header-y += posix_types_64.h
+header-y += posix_types_x32.h
 header-y += prctl.h
 header-y += processor-flags.h
 header-y += ptrace-abi.h
diff --git a/trunk/arch/x86/include/asm/posix_types.h b/trunk/arch/x86/include/asm/posix_types.h
index bb7133dc155d..3427b7798dbc 100644
--- a/trunk/arch/x86/include/asm/posix_types.h
+++ b/trunk/arch/x86/include/asm/posix_types.h
@@ -7,7 +7,9 @@
 #else
 # ifdef __i386__
 #  include "posix_types_32.h"
-# else
+# elif defined(__LP64__)
 #  include "posix_types_64.h"
+# else
+#  include "posix_types_x32.h"
 # endif
 #endif
diff --git a/trunk/arch/x86/include/asm/posix_types_x32.h b/trunk/arch/x86/include/asm/posix_types_x32.h
new file mode 100644
index 000000000000..85f9bdafa93c
--- /dev/null
+++ b/trunk/arch/x86/include/asm/posix_types_x32.h
@@ -0,0 +1,19 @@
+#ifndef _ASM_X86_POSIX_TYPES_X32_H
+#define _ASM_X86_POSIX_TYPES_X32_H
+
+/*
+ * This file is only used by user-level software, so you need to
+ * be a little careful about namespace pollution etc.  Also, we cannot
+ * assume GCC is being used.
+ *
+ * These types should generally match the ones used by the 64-bit kernel,
+ *
+ */
+
+typedef long long __kernel_long_t;
+typedef unsigned long long __kernel_ulong_t;
+#define __kernel_long_t __kernel_long_t
+
+#include <asm/posix_types_64.h>
+
+#endif /* _ASM_X86_POSIX_TYPES_X32_H */