[Xen-changelog] Revert two uses of CONFIG_PAGING_LEVELS to CPP rather than C predicate.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID b0dfd76ef5d27c42417450d0f3f56a2bfb43dbd6
# Parent  e0f66dbe4b1338cded442cbd90a593cfaf674e6a
Revert two uses of CONFIG_PAGING_LEVELS to CPP rather than C predicate.
Fixes PAE and 64-bit builds.

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r e0f66dbe4b13 -r b0dfd76ef5d2 xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c Wed Mar  1 17:34:06 2006
+++ b/xen/arch/x86/mm.c Wed Mar  1 22:35:55 2006
@@ -506,10 +506,10 @@
     vaddr <<= PGT_va_shift;
     rc = get_page_and_type_from_pagenr(
         l2e_get_pfn(l2e), PGT_l1_page_table | vaddr, d);
-
-    if ( (CONFIG_PAGING_LEVELS == 2) && unlikely(!rc) )
+#if CONFIG_PAGING_LEVELS == 2
+    if ( unlikely(!rc) )
         rc = get_linear_pagetable(l2e, pfn, d);
-
+#endif
     return rc;
 }
 
@@ -538,10 +538,10 @@
     rc = get_page_and_type_from_pagenr(
         l3e_get_pfn(l3e),
         PGT_l2_page_table | vaddr, d);
-
-    if ( (CONFIG_PAGING_LEVELS == 3) && unlikely(!rc) )
+#if CONFIG_PAGING_LEVELS == 3
+    if ( unlikely(!rc) )
         rc = get_linear_pagetable(l3e, pfn, d);
-
+#endif
     return rc;
 }
 #endif /* 3 level */

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