From: Keir Fraser <keir@xen.org>
Date: Wed, 16 Feb 2011 16:20:36 +0000 (+0000)
Subject: x86 p2m: Reinstate || errneously removed by 22924:86000076dcee
X-Git-Tag: RELEASE-4.14.0~17775
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=436de2833f7a5133214cfa0651d4fcc6d273ce50;p=people%2Ftklengyel%2Fxen.git

x86 p2m: Reinstate || errneously removed by 22924:86000076dcee

Fixes x86_32 build.

Signed-off-by: Keir Fraser <keir@xen.org>
---

diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c
index ed16b1551f..a8c0d6cb8a 100644
--- a/xen/arch/x86/mm/p2m.c
+++ b/xen/arch/x86/mm/p2m.c
@@ -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;