ia64/xen-unstable

changeset 4596:4fa88763f2cc

bitkeeper revision 1.1341 (42665fb46UgwC9x1OrVqB6qUISrloQ)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@firebug.cl.cam.ac.uk
date Wed Apr 20 13:57:08 2005 +0000 (2005-04-20)
parents 05621922c024 50a6d55c49c5
children 159c47d556ef
files xen/include/asm-x86/config.h xen/include/public/arch-x86_32.h xen/include/public/arch-x86_64.h
line diff
     1.1 --- a/xen/include/asm-x86/config.h	Wed Apr 20 13:02:32 2005 +0000
     1.2 +++ b/xen/include/asm-x86/config.h	Wed Apr 20 13:57:08 2005 +0000
     1.3 @@ -55,7 +55,11 @@
     1.4  
     1.5  #define OPT_CONSOLE_STR "com1,vga"
     1.6  
     1.7 -#define NR_CPUS 16
     1.8 +/*
     1.9 + * If you increase this value, please update NR_RESERVED_GDT_ENTRIES
    1.10 + * in include/public/arch-x86_xx.h
    1.11 + */
    1.12 +#define NR_CPUS 32
    1.13  
    1.14  /* Linkage for x86 */
    1.15  #define __ALIGN .align 16,0x90
     2.1 --- a/xen/include/public/arch-x86_32.h	Wed Apr 20 13:02:32 2005 +0000
     2.2 +++ b/xen/include/public/arch-x86_32.h	Wed Apr 20 13:57:08 2005 +0000
     2.3 @@ -33,10 +33,13 @@
     2.4   * in their ABI. These hard-coded values are always near the start of the GDT,
     2.5   * so Xen places itself out of the way.
     2.6   * 
     2.7 + * NR_RESERVED_GDT_ENTRIES is (8 + 2 * NR_CPUS) Please update this value if 
     2.8 + * you increase NR_CPUS or add another GDT entry to gdt_table in x86_32.S
     2.9 + *
    2.10   * NB. The reserved range is inclusive (that is, both FIRST_RESERVED_GDT_ENTRY
    2.11   * and LAST_RESERVED_GDT_ENTRY are reserved).
    2.12   */
    2.13 -#define NR_RESERVED_GDT_ENTRIES    40
    2.14 +#define NR_RESERVED_GDT_ENTRIES    72
    2.15  #define FIRST_RESERVED_GDT_ENTRY   256
    2.16  #define LAST_RESERVED_GDT_ENTRY    \
    2.17    (FIRST_RESERVED_GDT_ENTRY + NR_RESERVED_GDT_ENTRIES - 1)
     3.1 --- a/xen/include/public/arch-x86_64.h	Wed Apr 20 13:02:32 2005 +0000
     3.2 +++ b/xen/include/public/arch-x86_64.h	Wed Apr 20 13:57:08 2005 +0000
     3.3 @@ -27,10 +27,13 @@
     3.4   * in their ABI. These hard-coded values are always near the start of the GDT,
     3.5   * so Xen places itself out of the way.
     3.6   * 
     3.7 + * NR_RESERVED_GDT_ENTRIES is (8 + 4 * NR_CPUS) Please update this value if 
     3.8 + * you increase NR_CPUS or add another GDT entry to gdt_table in boot/x86_64.S
     3.9 + * 
    3.10   * NB. The reserved range is inclusive (that is, both FIRST_RESERVED_GDT_ENTRY
    3.11   * and LAST_RESERVED_GDT_ENTRY are reserved).
    3.12   */
    3.13 -#define NR_RESERVED_GDT_ENTRIES    72
    3.14 +#define NR_RESERVED_GDT_ENTRIES    136
    3.15  #define FIRST_RESERVED_GDT_ENTRY   256
    3.16  #define LAST_RESERVED_GDT_ENTRY    \
    3.17    (FIRST_RESERVED_GDT_ENTRY + NR_RESERVED_GDT_ENTRIES - 1)