# HG changeset patch
# User cl349@firebug.cl.cam.ac.uk
# Date 1117529562 0
# Node ID 3f244c5d2fe2e161bb9be4e6a641e027fa41206c
# Parent  69acd57e1bd82a88956c4cd15d3637caf22d75ca
bitkeeper revision 1.1603 (429c25daAxv8CzKG49dW0khs2wyBew)

xc_ptrace_core.c, xc_ptrace.c:
  SLES9 has a problem with it's <asm/elf.h> and other headers associated
  with it. Since we are only using one thing from this (that we really
  don't need) we can just stop including it.
http://bugzilla.xensource.com/cgi-bin/bugzilla/show_bug.cgi?id=34
Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>


diff -r 69acd57e1bd8 -r 3f244c5d2fe2 tools/libxc/xc_ptrace.c
--- a/tools/libxc/xc_ptrace.c	Tue May 31 08:27:49 2005 +0000
+++ b/tools/libxc/xc_ptrace.c	Tue May 31 08:52:42 2005 +0000
@@ -1,7 +1,6 @@
 #include <sys/ptrace.h>
 #include <sys/wait.h>
 #include "xc_private.h"
-#include <asm/elf.h>
 #include <time.h>
 
 
@@ -301,7 +300,7 @@ xc_ptrace(enum __ptrace_request request,
 
 	if (request == PTRACE_GETREGS) {
 		SET_PT_REGS(pt, ctxt[cpu].user_regs); 
-		memcpy(data, &pt, sizeof(elf_gregset_t));
+		memcpy(data, &pt, sizeof(struct gdb_regs));
 	} else if (request == PTRACE_GETFPREGS)
 	    memcpy(data, &ctxt[cpu].fpu_ctxt, sizeof(ctxt[cpu].fpu_ctxt));
 	else /*if (request == PTRACE_GETFPXREGS)*/
diff -r 69acd57e1bd8 -r 3f244c5d2fe2 tools/libxc/xc_ptrace_core.c
--- a/tools/libxc/xc_ptrace_core.c	Tue May 31 08:27:49 2005 +0000
+++ b/tools/libxc/xc_ptrace_core.c	Tue May 31 08:52:42 2005 +0000
@@ -1,7 +1,6 @@
 #include <sys/ptrace.h>
 #include <sys/wait.h>
 #include "xc_private.h"
-#include <asm/elf.h>
 #include <time.h>
 
 
@@ -258,7 +257,7 @@ xc_ptrace_core(enum __ptrace_request req
     case PTRACE_GETFPXREGS:
 	if (request == PTRACE_GETREGS) {
 		SET_PT_REGS(pt, ctxt[cpu].user_regs); 
-		memcpy(data, &pt, sizeof(elf_gregset_t));
+		memcpy(data, &pt, sizeof(struct gdb_regs));
 	} else if (request == PTRACE_GETFPREGS)
 	    memcpy(data, &ctxt[cpu].fpu_ctxt, sizeof(ctxt[cpu].fpu_ctxt));
 	else /*if (request == PTRACE_GETFPXREGS)*/