[uml-devel] [PATCH 1/2] UML - Fix registers.c build

[uml-devel] [PATCH 1/2] UML - Fix registers.c build

[Jeff Dike]

uml-stop-saving-process-fp-state.patch broke the UML/x86_64 build.

On x86_64, sys/ptrace.h has to be included before asm/ptrace.h.
Otherwise, the defines in asm/ptrace.h will ruin the parse of
sys/ptrace.h - 
    asm/ptrace.h:
	#define PTRACE_GETREGS            12

    sys/ptrace.h:
	enum __ptrace_request
	{
	...
	   PTRACE_GETREGS = 12,
	...
	}

Also, errno.h was missing.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
---
 arch/um/os-Linux/sys-x86_64/registers.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: linux-2.6.20/arch/um/os-Linux/sys-x86_64/registers.c
===================================================================
--- linux-2.6.20.orig/arch/um/os-Linux/sys-x86_64/registers.c	2007-09-18 20:51:35.000000000 -0400
+++ linux-2.6.20/arch/um/os-Linux/sys-x86_64/registers.c	2007-09-18 20:52:15.000000000 -0400
@@ -3,9 +3,10 @@
  * Licensed under the GPL
  */
 
+#include <errno.h>
+#include <sys/ptrace.h>
 #define __FRAME_OFFSETS
 #include <asm/ptrace.h>
-#include <sys/ptrace.h>
 #include "longjmp.h"
 #include "user.h"

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

[PATCH 1/2] UML - Fix registers.c build

[Jeff Dike]

uml-stop-saving-process-fp-state.patch broke the UML/x86_64 build.

On x86_64, sys/ptrace.h has to be included before asm/ptrace.h.
Otherwise, the defines in asm/ptrace.h will ruin the parse of
sys/ptrace.h - 
    asm/ptrace.h:
	#define PTRACE_GETREGS            12

    sys/ptrace.h:
	enum __ptrace_request
	{
	...
	   PTRACE_GETREGS = 12,
	...
	}

Also, errno.h was missing.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
---
 arch/um/os-Linux/sys-x86_64/registers.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: linux-2.6.20/arch/um/os-Linux/sys-x86_64/registers.c
===================================================================
--- linux-2.6.20.orig/arch/um/os-Linux/sys-x86_64/registers.c	2007-09-18 20:51:35.000000000 -0400
+++ linux-2.6.20/arch/um/os-Linux/sys-x86_64/registers.c	2007-09-18 20:52:15.000000000 -0400
@@ -3,9 +3,10 @@
  * Licensed under the GPL
  */
 
+#include <errno.h>
+#include <sys/ptrace.h>
 #define __FRAME_OFFSETS
 #include <asm/ptrace.h>
-#include <sys/ptrace.h>
 #include "longjmp.h"
 #include "user.h"