From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sc8-sf-mx1-b.sourceforge.net ([10.3.1.91] helo=mail.sourceforge.net) by sc8-sf-list1-new.sourceforge.net with esmtp (Exim 4.43) id 1Hy9XX-0003LM-4c for user-mode-linux-devel@lists.sourceforge.net; Tue, 12 Jun 2007 09:48:19 -0700 Received: from saraswathi.solana.com ([198.99.130.12]) by mail.sourceforge.net with esmtps (TLSv1:AES256-SHA:256) (Exim 4.44) id 1Hy9XV-0000zh-Lx for user-mode-linux-devel@lists.sourceforge.net; Tue, 12 Jun 2007 09:48:19 -0700 Date: Tue, 12 Jun 2007 12:48:07 -0400 From: Jeff Dike Message-ID: <20070612164807.GA7522@c2.user-mode-linux.org> Mime-Version: 1.0 Content-Disposition: inline Subject: [uml-devel] [PATCH 2/2] UML - kill x86_64 STACK_TOP_MAX 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 The x86_64 a.out.h got a definition of STACK_TOP_MAX, which interferes with the UML version. So, just undef it like STACK_TOP. Signed-off-by: Jeff Dike -- include/asm-um/a.out.h | 1 + 1 file changed, 1 insertion(+) Index: linux-2.6.21-mm/include/asm-um/a.out.h =================================================================== --- linux-2.6.21-mm.orig/include/asm-um/a.out.h 2007-06-06 09:28:48.000000000 -0400 +++ linux-2.6.21-mm/include/asm-um/a.out.h 2007-06-06 15:51:02.000000000 -0400 @@ -5,6 +5,7 @@ #include "choose-mode.h" #undef STACK_TOP +#undef STACK_TOP_MAX extern unsigned long stacksizelim; ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ 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 S1756161AbXFLQsd (ORCPT ); Tue, 12 Jun 2007 12:48:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754541AbXFLQs0 (ORCPT ); Tue, 12 Jun 2007 12:48:26 -0400 Received: from saraswathi.solana.com ([198.99.130.12]:52238 "EHLO saraswathi.solana.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754495AbXFLQsZ (ORCPT ); Tue, 12 Jun 2007 12:48:25 -0400 Date: Tue, 12 Jun 2007 12:48:07 -0400 From: Jeff Dike To: Andrew Morton Cc: LKML , uml-devel Subject: [PATCH 2/2] UML - kill x86_64 STACK_TOP_MAX Message-ID: <20070612164807.GA7522@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 The x86_64 a.out.h got a definition of STACK_TOP_MAX, which interferes with the UML version. So, just undef it like STACK_TOP. Signed-off-by: Jeff Dike -- include/asm-um/a.out.h | 1 + 1 file changed, 1 insertion(+) Index: linux-2.6.21-mm/include/asm-um/a.out.h =================================================================== --- linux-2.6.21-mm.orig/include/asm-um/a.out.h 2007-06-06 09:28:48.000000000 -0400 +++ linux-2.6.21-mm/include/asm-um/a.out.h 2007-06-06 15:51:02.000000000 -0400 @@ -5,6 +5,7 @@ #include "choose-mode.h" #undef STACK_TOP +#undef STACK_TOP_MAX extern unsigned long stacksizelim;