From mboxrd@z Thu Jan  1 00:00:00 1970
From: Olaf Hering <olaf@aepfle.de>
Subject: Re: [PATCH] x86/mm: partially revert 21093:4a3e131f7498
Date: Wed, 16 Feb 2011 17:11:16 +0100
Message-ID: <20110216161116.GA25474@aepfle.de>
References: <20140bcb4c047c541059.1297691405@whitby.uk.xensource.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
In-Reply-To: <20140bcb4c047c541059.1297691405@whitby.uk.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Tim Deegan <Tim.Deegan@citrix.com>
Cc: xen-devel@lists.xensource.com, Gianni.Tedesco@citrix.com
List-Id: xen-devel@lists.xenproject.org

On Mon, Feb 14, Tim Deegan wrote:

> diff -r af84691a6cf9 -r 20140bcb4c04 xen/arch/x86/mm/p2m.c
> --- a/xen/arch/x86/mm/p2m.c	Mon Feb 14 10:41:12 2011 +0000
> +++ b/xen/arch/x86/mm/p2m.c	Mon Feb 14 13:40:32 2011 +0000

> @@ -2314,7 +2313,7 @@ static int gfn_check_limit(
>       * hardware translation limit. This limitation is checked by comparing
>       * gfn with 0xfffffUL.
>       */
> -    if ( !paging_mode_hap(d) || ((gfn + (1ul << order)) <= 0x100000UL) ||
> +    if ( !hap_enabled(d) || ((gfn + (1ul << order)) <= 0x100000UL)

This removes the ||

p2m.c: In function 'gfn_check_limit':
p2m.c:2317: error: called object '(1ul << (int)order) + gfn <= 1048576ul' is not a function
make[4]: *** [p2m.o] Error 1