ia64/xen-unstable

changeset 5376:9312a7006284

bitkeeper revision 1.1691.1.10 (42a70b27-Oq9klHVoCm0PlmeoehF8g)

Config option is CONFIG_X86_PAE, not CONFIG_PAE.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Wed Jun 08 15:13:43 2005 +0000 (2005-06-08)
parents be46d7ecf186
children 936540389715
files xen/arch/x86/mm.c xen/include/asm-x86/page.h
line diff
     1.1 --- a/xen/arch/x86/mm.c	Wed Jun 08 15:13:07 2005 +0000
     1.2 +++ b/xen/arch/x86/mm.c	Wed Jun 08 15:13:43 2005 +0000
     1.3 @@ -1104,7 +1104,7 @@ static int mod_l3_entry(l3_pgentry_t *pl
     1.4          return 0;
     1.5      }
     1.6  
     1.7 -#ifdef CONFIG_PAE
     1.8 +#ifdef CONFIG_X86_PAE
     1.9      /*
    1.10       * Disallow updates to final L3 slot. It contains Xen mappings, and it
    1.11       * would be a pain to ensure they remain continuously valid throughout.
    1.12 @@ -1400,7 +1400,7 @@ int get_page_type(struct pfn_info *page,
    1.13                  else if ( ((type & PGT_va_mask) != PGT_va_mutable) &&
    1.14                            ((type & PGT_va_mask) != (x & PGT_va_mask)) )
    1.15                  {
    1.16 -#ifdef CONFIG_PAE
    1.17 +#ifdef CONFIG_X86_PAE
    1.18                      /* We use backptr as extra typing. Cannot be unknown. */
    1.19                      if ( (type & PGT_type_mask) == PGT_l2_page_table )
    1.20                          return 0;
    1.21 @@ -1671,7 +1671,7 @@ int do_mmuext_op(
    1.22              
    1.23              break;
    1.24  
    1.25 -#ifndef CONFIG_PAE /* Unsafe on PAE because of Xen-private mappings. */
    1.26 +#ifndef CONFIG_X86_PAE /* Unsafe on PAE because of Xen-private mappings. */
    1.27          case MMUEXT_PIN_L2_TABLE:
    1.28              type = PGT_l2_page_table;
    1.29              goto pin_page;
     2.1 --- a/xen/include/asm-x86/page.h	Wed Jun 08 15:13:07 2005 +0000
     2.2 +++ b/xen/include/asm-x86/page.h	Wed Jun 08 15:13:43 2005 +0000
     2.3 @@ -185,7 +185,7 @@ typedef struct { u64 pfn; } pagetable_t;
     2.4  #define pfn_valid(_pfn)     ((_pfn) < max_page)
     2.5  
     2.6  /* High table entries are reserved by the hypervisor. */
     2.7 -#if defined(CONFIG_X86_32) && !defined(CONFIG_PAE)
     2.8 +#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
     2.9  #define DOMAIN_ENTRIES_PER_L2_PAGETABLE     \
    2.10    (HYPERVISOR_VIRT_START >> L2_PAGETABLE_SHIFT)
    2.11  #define HYPERVISOR_ENTRIES_PER_L2_PAGETABLE \