From 16d997840aab1fbc3dc949fbb6b9539c7dc2f466 Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Wed, 2 Mar 2011 22:53:11 -0800
Subject: [PATCH] Statetrace: Use sys/user.h instead of linux/user.h.

---
 util/statetrace/arch/i386/tracechild.cc | 12 ++++++------
 util/statetrace/arch/i386/tracechild.hh |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/util/statetrace/arch/i386/tracechild.cc b/util/statetrace/arch/i386/tracechild.cc
index 0d868767c..67223666c 100644
--- a/util/statetrace/arch/i386/tracechild.cc
+++ b/util/statetrace/arch/i386/tracechild.cc
@@ -54,12 +54,12 @@ I386TraceChild::getRegs(user_regs_struct & myregs, int num)
       case EBP: return myregs.ebp;
       case ESP: return myregs.esp;
       //Segmentation registers
-      case CS: return myregs.cs;
-      case DS: return myregs.ds;
-      case ES: return myregs.es;
-      case FS: return myregs.fs;
-      case GS: return myregs.gs;
-      case SS: return myregs.ss;
+      case CS: return myregs.xcs;
+      case DS: return myregs.xds;
+      case ES: return myregs.xes;
+      case FS: return myregs.xfs;
+      case GS: return myregs.xgs;
+      case SS: return myregs.xss;
       //PC
       case EIP: return myregs.eip;
       default:
diff --git a/util/statetrace/arch/i386/tracechild.hh b/util/statetrace/arch/i386/tracechild.hh
index 3af621ed6..30c75afec 100644
--- a/util/statetrace/arch/i386/tracechild.hh
+++ b/util/statetrace/arch/i386/tracechild.hh
@@ -31,7 +31,7 @@
 #ifndef REGSTATE_I386_HH
 #define REGSTATE_I386_HH
 
-#include <linux/user.h>
+#include <sys/user.h>
 #include <sys/types.h>
 #include <sys/ptrace.h>
 #include <cassert>
-- 
2.30.2