[Xen-changelog] [xen-unstable] x86 p2m: Reinstate || errneously removed by 22924:86000076dcee

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1297873236 0
# Node ID 09d22ec44756fb220983034ab3f4edd636f181cc
# Parent  72470de157ce85e3ac813f6e8e63558a66bdcb51
x86 p2m: Reinstate || errneously removed by 22924:86000076dcee

Fixes x86_32 build.

Signed-off-by: Keir Fraser <keir@xxxxxxx>
---
 xen/arch/x86/mm/p2m.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r 72470de157ce -r 09d22ec44756 xen/arch/x86/mm/p2m.c
--- a/xen/arch/x86/mm/p2m.c     Wed Feb 16 09:49:33 2011 +0000
+++ b/xen/arch/x86/mm/p2m.c     Wed Feb 16 16:20:36 2011 +0000
@@ -2313,7 +2313,7 @@ static int gfn_check_limit(
      * hardware translation limit. This limitation is checked by comparing
      * gfn with 0xfffffUL.
      */
-    if ( !hap_enabled(d) || ((gfn + (1ul << order)) <= 0x100000UL)
+    if ( !hap_enabled(d) || ((gfn + (1ul << order)) <= 0x100000UL) ||
          (boot_cpu_data.x86_vendor != X86_VENDOR_AMD) )
         return 0;
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog