From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sc8-sf-mx1-b.sourceforge.net ([10.3.1.11] helo=sc8-sf-mx1.sourceforge.net) by sc8-sf-list1.sourceforge.net with esmtp (Exim 4.30) id 1DZwQ4-0006wd-Cy for user-mode-linux-devel@lists.sourceforge.net; Sun, 22 May 2005 12:47:28 -0700 Received: from rproxy.gmail.com ([64.233.170.194]) by sc8-sf-mx1.sourceforge.net with esmtp (Exim 4.41) id 1DZwQ2-0000TS-9b for user-mode-linux-devel@lists.sourceforge.net; Sun, 22 May 2005 12:47:28 -0700 Received: by rproxy.gmail.com with SMTP id f1so1134762rne for ; Sun, 22 May 2005 12:47:25 -0700 (PDT) Message-ID: <4290E1C6.9070709@gmail.com> From: Eric BEGOT Reply-To: eric.begot@gmail.com MIME-Version: 1.0 References: <200505201436.j4KEZxjh006235@ccure.user-mode-linux.org> In-Reply-To: <200505201436.j4KEZxjh006235@ccure.user-mode-linux.org> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Subject: [uml-devel] [PATCH] UML - 2.6.12-rc4-mm2 Compile error Sender: user-mode-linux-devel-admin@lists.sourceforge.net Errors-To: user-mode-linux-devel-admin@lists.sourceforge.net List-Unsubscribe: , List-Id: The user-mode Linux development list List-Post: List-Help: List-Subscribe: , List-Archive: Date: Sun, 22 May 2005 21:47:18 +0200 To: Jeff Dike Cc: Andrew Morton , linux-kernel@vger.kernel.org, user-mode-linux-devel@lists.sourceforge.net Here is a patch to correct a compile error on linux 2.6.12-rc4-mm2 for uml. At the compilation of init/main.c, it complains because it doens't find the 2 constants FIXADDR_USER_START and FIXADDR_USER_END --- linux-2.6.12-rc4-mm2/include/asm/fixmap.h.orig 2005-05-22 21:37:13.000000000 +0200 +++ linux-2.6.12-rc4-mm2/include/asm/fixmap.h 2005-05-22 21:38:17.000000000 +0200 @@ -60,7 +60,8 @@ extern unsigned long get_kmem_end(void); #define FIXADDR_TOP (get_kmem_end() - 0x2000) #define FIXADDR_SIZE (__end_of_fixed_addresses << PAGE_SHIFT) -#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE) +#define FIXADDR_USER_START (FIXADDR_TOP - FIXADDR_SIZE) +#define FIXADDR_USER_END FIXADDR_TOP #define __fix_to_virt(x) (FIXADDR_TOP - ((x) << PAGE_SHIFT)) #define __virt_to_fix(x) ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT) @@ -91,7 +92,7 @@ static inline unsigned long fix_to_virt( static inline unsigned long virt_to_fix(const unsigned long vaddr) { - BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_START); + BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_USER_START); return __virt_to_fix(vaddr); } ------------------------------------------------------- This SF.Net email is sponsored by Oracle Space Sweepstakes Want to be the first software developer in space? Enter now for the Oracle Space Sweepstakes! http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click _______________________________________________ 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 S261275AbVEVTrb (ORCPT ); Sun, 22 May 2005 15:47:31 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261615AbVEVTrb (ORCPT ); Sun, 22 May 2005 15:47:31 -0400 Received: from rproxy.gmail.com ([64.233.170.206]:43102 "EHLO rproxy.gmail.com") by vger.kernel.org with ESMTP id S261275AbVEVTr0 (ORCPT ); Sun, 22 May 2005 15:47:26 -0400 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:reply-to:user-agent:x-accept-language:mime-version:to:cc:subject:references:in-reply-to:content-type:content-transfer-encoding; b=lo24WPf4/dBh9tUCfQ4PO7L+uzk/yww2TJqhHxGNuE4TN8c5Htq7AXvCH537idblSnzyrm0iTHnjTtL1Ue/vfFJGvxnqwV+bDKJFbsLNOsNfsj8G8hW6G3zDO6AvLTla7c9TtSouZvyAhg7Cx6sLPSgc//0d0RzOHJ01Wwyy5uU= Message-ID: <4290E1C6.9070709@gmail.com> Date: Sun, 22 May 2005 21:47:18 +0200 From: Eric BEGOT Reply-To: eric.begot@gmail.com User-Agent: Mozilla Thunderbird 1.0.2 (X11/20050331) X-Accept-Language: fr, en MIME-Version: 1.0 To: Jeff Dike CC: Andrew Morton , linux-kernel@vger.kernel.org, user-mode-linux-devel@lists.sourceforge.net Subject: [PATCH] UML - 2.6.12-rc4-mm2 Compile error References: <200505201436.j4KEZxjh006235@ccure.user-mode-linux.org> In-Reply-To: <200505201436.j4KEZxjh006235@ccure.user-mode-linux.org> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Here is a patch to correct a compile error on linux 2.6.12-rc4-mm2 for uml. At the compilation of init/main.c, it complains because it doens't find the 2 constants FIXADDR_USER_START and FIXADDR_USER_END --- linux-2.6.12-rc4-mm2/include/asm/fixmap.h.orig 2005-05-22 21:37:13.000000000 +0200 +++ linux-2.6.12-rc4-mm2/include/asm/fixmap.h 2005-05-22 21:38:17.000000000 +0200 @@ -60,7 +60,8 @@ extern unsigned long get_kmem_end(void); #define FIXADDR_TOP (get_kmem_end() - 0x2000) #define FIXADDR_SIZE (__end_of_fixed_addresses << PAGE_SHIFT) -#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE) +#define FIXADDR_USER_START (FIXADDR_TOP - FIXADDR_SIZE) +#define FIXADDR_USER_END FIXADDR_TOP #define __fix_to_virt(x) (FIXADDR_TOP - ((x) << PAGE_SHIFT)) #define __virt_to_fix(x) ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT) @@ -91,7 +92,7 @@ static inline unsigned long fix_to_virt( static inline unsigned long virt_to_fix(const unsigned long vaddr) { - BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_START); + BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_USER_START); return __virt_to_fix(vaddr); }