[Xen-changelog] Config option is CONFIG_X86_PAE, not CONFIG_PAE.

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1701, 2005/06/08 16:13:43+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        Config option is CONFIG_X86_PAE, not CONFIG_PAE.
        Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>



 arch/x86/mm.c          |    6 +++---
 include/asm-x86/page.h |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)


diff -Nru a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c 2005-06-08 12:02:40 -04:00
+++ b/xen/arch/x86/mm.c 2005-06-08 12:02:40 -04:00
@@ -1104,7 +1104,7 @@
         return 0;
     }
 
-#ifdef CONFIG_PAE
+#ifdef CONFIG_X86_PAE
     /*
      * Disallow updates to final L3 slot. It contains Xen mappings, and it
      * would be a pain to ensure they remain continuously valid throughout.
@@ -1400,7 +1400,7 @@
                 else if ( ((type & PGT_va_mask) != PGT_va_mutable) &&
                           ((type & PGT_va_mask) != (x & PGT_va_mask)) )
                 {
-#ifdef CONFIG_PAE
+#ifdef CONFIG_X86_PAE
                     /* We use backptr as extra typing. Cannot be unknown. */
                     if ( (type & PGT_type_mask) == PGT_l2_page_table )
                         return 0;
@@ -1671,7 +1671,7 @@
             
             break;
 
-#ifndef CONFIG_PAE /* Unsafe on PAE because of Xen-private mappings. */
+#ifndef CONFIG_X86_PAE /* Unsafe on PAE because of Xen-private mappings. */
         case MMUEXT_PIN_L2_TABLE:
             type = PGT_l2_page_table;
             goto pin_page;
diff -Nru a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h
--- a/xen/include/asm-x86/page.h        2005-06-08 12:02:39 -04:00
+++ b/xen/include/asm-x86/page.h        2005-06-08 12:02:39 -04:00
@@ -185,7 +185,7 @@
 #define pfn_valid(_pfn)     ((_pfn) < max_page)
 
 /* High table entries are reserved by the hypervisor. */
-#if defined(CONFIG_X86_32) && !defined(CONFIG_PAE)
+#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
 #define DOMAIN_ENTRIES_PER_L2_PAGETABLE     \
   (HYPERVISOR_VIRT_START >> L2_PAGETABLE_SHIFT)
 #define HYPERVISOR_ENTRIES_PER_L2_PAGETABLE \

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