From bbf93e9838ac59fe277d4bd0418a9f8dc2cbf997 Mon Sep 17 00:00:00 2001
From: Jeff Dike <jdike@addtoit.com>
Date: Thu, 12 Jun 2008 15:21:40 -0700
Subject: [PATCH] --- yaml --- r: 98056 b: refs/heads/master c:
 14c8a77e1bbd693446dad297d2ae2dd22f187e4f h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/um/os-Linux/sys-i386/registers.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e17555148f89..606dc92e1f5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 529a4f4ec90ffd9394fdfc22bea7a858ae343171
+refs/heads/master: 14c8a77e1bbd693446dad297d2ae2dd22f187e4f
diff --git a/trunk/arch/um/os-Linux/sys-i386/registers.c b/trunk/arch/um/os-Linux/sys-i386/registers.c
index b487cbead1bd..229f7a53d8da 100644
--- a/trunk/arch/um/os-Linux/sys-i386/registers.c
+++ b/trunk/arch/um/os-Linux/sys-i386/registers.c
@@ -6,7 +6,7 @@
 
 #include <errno.h>
 #include <sys/ptrace.h>
-#include <asm/user.h>
+#include <sys/user.h>
 #include "kern_constants.h"
 #include "longjmp.h"
 #include "user.h"
@@ -76,7 +76,7 @@ int put_fp_registers(int pid, unsigned long *regs)
 
 void arch_init_registers(int pid)
 {
-	struct user_fxsr_struct fpx_regs;
+	struct user_fpxregs_struct fpx_regs;
 	int err;
 
 	err = ptrace(PTRACE_GETFPXREGS, pid, 0, &fpx_regs);