diff options
| author | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-04-06 09:36:34 +0000 |
|---|---|---|
| committer | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-04-06 09:36:34 +0000 |
| commit | 440c26513f30b6ce01be26c9fad17b5dd2551a18 (patch) | |
| tree | 037cfbc144b47459950928ecf0cf0dc92d8a86a2 | |
| parent | 4bb4c0ffa32745be3f0f4a8c0abc2cd3fda3f715 (diff) | |
| download | xen-440c26513f30b6ce01be26c9fad17b5dd2551a18.tar.gz xen-440c26513f30b6ce01be26c9fad17b5dd2551a18.tar.bz2 xen-440c26513f30b6ce01be26c9fad17b5dd2551a18.zip | |
bitkeeper revision 1.851 (40727a22MmBKMBWlk5lt-AMqNaoA-A)
Reduce Xen heap size to make room for full 4GB pfn_info array.
| -rw-r--r-- | xen/common/kernel.c | 6 | ||||
| -rw-r--r-- | xen/include/asm-i386/config.h | 11 |
2 files changed, 8 insertions, 9 deletions
diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 4fd4990ac0..3c10cf3ca2 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -213,9 +213,9 @@ void cmain(unsigned long magic, multiboot_info_t *mbi) set_current(&idle0_task); init_frametable(max_page); - printk("Initialised %luMB memory on a %luMB machine\n", - max_page >> (20-PAGE_SHIFT), - max_mem >> (20-PAGE_SHIFT) ); + printk("Initialised %luMB memory (%lu pages) on a %luMB machine\n", + max_page >> (20-PAGE_SHIFT), max_page, + max_mem >> (20-PAGE_SHIFT)); initial_images_start = MAX_DIRECTMAP_ADDRESS; initial_images_end = initial_images_start + diff --git a/xen/include/asm-i386/config.h b/xen/include/asm-i386/config.h index 28dd1e3e68..cb550ee172 100644 --- a/xen/include/asm-i386/config.h +++ b/xen/include/asm-i386/config.h @@ -67,12 +67,11 @@ #define READONLY_MPT_VIRT_START (HYPERVISOR_VIRT_START) #define READONLY_MPT_VIRT_END (READONLY_MPT_VIRT_START + (4*1024*1024)) /* - * Next 16MB is fixed monitor space, which is part of a 44MB direct-mapped + * Next 12MB is fixed monitor space, which is part of a 40MB direct-mapped * memory region. The following are machine addresses. */ -#define MAX_MONITOR_ADDRESS (16*1024*1024) -#define MAX_DMA_ADDRESS (16*1024*1024) -#define MAX_DIRECTMAP_ADDRESS (40*1024*1024) // XXX was 44 +#define MAX_MONITOR_ADDRESS (12*1024*1024) +#define MAX_DIRECTMAP_ADDRESS (40*1024*1024) /* And the virtual addresses for the direct-map region... */ #define DIRECTMAP_VIRT_START (READONLY_MPT_VIRT_END) #define DIRECTMAP_VIRT_END (DIRECTMAP_VIRT_START + MAX_DIRECTMAP_ADDRESS) @@ -86,8 +85,8 @@ #define LINEAR_PT_VIRT_START (DIRECTMAP_VIRT_END) #define LINEAR_PT_VIRT_END (LINEAR_PT_VIRT_START + (4*1024*1024)) /* Next 4MB of virtual address space is used as a shadow linear p.t. map. */ -#define SH_LINEAR_PT_VIRT_START (LINEAR_PT_VIRT_END) -#define SH_LINEAR_PT_VIRT_END (SH_LINEAR_PT_VIRT_START + (4*1024*1024)) +#define SH_LINEAR_PT_VIRT_START (LINEAR_PT_VIRT_END) +#define SH_LINEAR_PT_VIRT_END (SH_LINEAR_PT_VIRT_START + (4*1024*1024)) /* Next 4MB of virtual address space used for per-domain mappings (eg. GDT). */ #define PERDOMAIN_VIRT_START (SH_LINEAR_PT_VIRT_END) #define PERDOMAIN_VIRT_END (PERDOMAIN_VIRT_START + (4*1024*1024)) |