From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+willy=40w.ods.org@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id <S263241AbSJOHTi>; Tue, 15 Oct 2002 03:19:38 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org
	id <S263246AbSJOHTh>; Tue, 15 Oct 2002 03:19:37 -0400
Received: from e35.co.us.ibm.com ([32.97.110.133]:9205 "EHLO e35.co.us.ibm.com")
	by vger.kernel.org with ESMTP id <S263241AbSJOHTc>;
	Tue, 15 Oct 2002 03:19:32 -0400
Date: Tue, 15 Oct 2002 00:25:42 -0700
From: Mike Anderson <andmike@us.ibm.com>
To: Oleg Drokin <green@namesys.com>
Cc: Jeff Dike <jdike@karaya.com>, user-mode-linux-devel@lists.sourceforge.net,
       linux-kernel@vger.kernel.org
Subject: Re: [uml-devel] Re: uml-patch-2.5.42-1
Message-ID: <20021015072541.GA12781@beaverton.ibm.com>
Mail-Followup-To: Oleg Drokin <green@namesys.com>,
	Jeff Dike <jdike@karaya.com>,
	user-mode-linux-devel@lists.sourceforge.net,
	linux-kernel@vger.kernel.org
References: <200210150058.TAA05520@ccure.karaya.com> <20021015104210.A1335@namesys.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20021015104210.A1335@namesys.com>
User-Agent: Mutt/1.4i
X-Operating-System: Linux 2.0.32 on an i486
Sender: linux-kernel-owner@vger.kernel.org
X-Mailing-List: linux-kernel@vger.kernel.org

I am hitting this same issue. I cannot see what is setting __i386__.
A similar hack of undef __i386__ inside the files makes mine work.

Oleg Drokin [green@namesys.com] wrote:
> Hello!
> 
> On Mon, Oct 14, 2002 at 07:58:28PM -0500, Jeff Dike wrote:
> > UML has been updated to 2.5.42 and UML 2.4.19-12.  In non-numeric terms,
> 
> For some reason I now need this patch to make bk-current to compile
> (with 2.5.42-1 patch from you applied, of course).
> I do not claim this is correct fix, but at least it works for me ;)
> 
> ===== drivers/char/random.c 1.24 vs edited =====
> --- 1.24/drivers/char/random.c	Mon Oct  7 18:38:26 2002
> +++ edited/drivers/char/random.c	Tue Oct 15 10:20:50 2002
> @@ -738,7 +738,7 @@
>  	__s32		delta, delta2, delta3;
>  	int		entropy = 0;
>  
> -#if defined (__i386__) || defined (__x86_64__)
> +#if (defined (__i386__) || defined (__x86_64__)) && !defined (__arch_um__)
>  	if (cpu_has_tsc) {
>  		__u32 high;
>  		rdtsc(time, high);
> ===== drivers/char/mem.c 1.23 vs edited =====
> --- 1.23/drivers/char/mem.c	Mon Aug  5 23:05:22 2002
> +++ edited/drivers/char/mem.c	Tue Oct 15 10:18:31 2002
> @@ -132,6 +132,7 @@
>  {
>  	unsigned long prot = pgprot_val(_prot);
>  
> +#if !defined(__arch_um__)
>  #if defined(__i386__) || defined(__x86_64__)
>  	/* On PPro and successors, PCD alone doesn't always mean 
>  	    uncached because of interactions with the MTRRs. PCD | PWT
> @@ -152,7 +153,7 @@
>  	else if (MMU_IS_040 || MMU_IS_060)
>  		prot = (prot & _CACHEMASK040) | _PAGE_NOCACHE_S;
>  #endif
> -
> +#endif
>  	return __pgprot(prot);
>  }
>  
> @@ -164,7 +165,7 @@
>   */
>  static inline int noncached_address(unsigned long addr)
>  {
> -#if defined(__i386__)
> +#if defined(__i386__) && !defined(__arch_um__)
>  	/* 
>  	 * On the PPro and successors, the MTRRs are used to set
>  	 * memory types for physical addresses outside main memory, 
> 
> 
> -------------------------------------------------------
> This sf.net email is sponsored by:ThinkGeek
> Welcome to geek heaven.
> http://thinkgeek.com/sf
> _______________________________________________
> User-mode-linux-devel mailing list
> User-mode-linux-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
-andmike
--
Michael Anderson
andmike@us.ibm.com