From e9dceb730608b4f1a4063765f611e36f142ff05a Mon Sep 17 00:00:00 2001
From: Richard Weinberger <richard@nod.at>
Date: Thu, 18 Aug 2011 21:58:07 +0200
Subject: [PATCH] --- yaml --- r: 273063 b: refs/heads/master c:
 38b64aed786d59854ecc850ee5ece85b61dd252b h: refs/heads/master i:   273061:
 6f086ede27681600bb84ec1c497c85540f2bd042   273059:
 40427a1314a8dca14dd4399481e06c288565e29d   273055:
 0887b3ade61813d0822f5f1a096c5ceeb6b4c9f4 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/um/os-Linux/registers.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a49360ffcee8..321f3c123039 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0af6cbfa2eb675643cc651114364752e972900b
+refs/heads/master: 38b64aed786d59854ecc850ee5ece85b61dd252b
diff --git a/trunk/arch/x86/um/os-Linux/registers.c b/trunk/arch/x86/um/os-Linux/registers.c
index fa2e5a669e41..0cdbb86b012b 100644
--- a/trunk/arch/x86/um/os-Linux/registers.c
+++ b/trunk/arch/x86/um/os-Linux/registers.c
@@ -6,7 +6,9 @@
 
 #include <errno.h>
 #include <sys/ptrace.h>
+#ifdef __i386__
 #include <sys/user.h>
+#endif
 #include "longjmp.h"
 #include "sysdep/ptrace_user.h"