From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sc8-sf-mx2-b.sourceforge.net ([10.3.1.92] helo=mail.sourceforge.net) by sc8-sf-list1-new.sourceforge.net with esmtp (Exim 4.43) id 1IXoPY-0002CU-NX for user-mode-linux-devel@lists.sourceforge.net; Tue, 18 Sep 2007 18:31:28 -0700 Received: from saraswathi.solana.com ([198.99.130.12]) by mail.sourceforge.net with esmtps (TLSv1:AES256-SHA:256) (Exim 4.44) id 1IXoPX-0006yC-47 for user-mode-linux-devel@lists.sourceforge.net; Tue, 18 Sep 2007 18:31:28 -0700 Date: Tue, 18 Sep 2007 21:31:23 -0400 From: Jeff Dike Message-ID: <20070919013123.GA10822@c2.user-mode-linux.org> Mime-Version: 1.0 Content-Disposition: inline Subject: [uml-devel] [PATCH 1/2] UML - Fix registers.c build List-Id: The user-mode Linux development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: user-mode-linux-devel-bounces@lists.sourceforge.net Errors-To: user-mode-linux-devel-bounces@lists.sourceforge.net To: Andrew Morton Cc: LKML , uml-devel 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 --- 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 +#include #define __FRAME_OFFSETS #include -#include #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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752513AbXISBbu (ORCPT ); Tue, 18 Sep 2007 21:31:50 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751172AbXISBbm (ORCPT ); Tue, 18 Sep 2007 21:31:42 -0400 Received: from saraswathi.solana.com ([198.99.130.12]:49031 "EHLO saraswathi.solana.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751009AbXISBbl (ORCPT ); Tue, 18 Sep 2007 21:31:41 -0400 Date: Tue, 18 Sep 2007 21:31:23 -0400 From: Jeff Dike To: Andrew Morton Cc: LKML , uml-devel Subject: [PATCH 1/2] UML - Fix registers.c build Message-ID: <20070919013123.GA10822@c2.user-mode-linux.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.2.3i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 +#include #define __FRAME_OFFSETS #include -#include #include "longjmp.h" #include "user.h"