diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-05-20 23:17:26 +0000 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-05-20 23:17:26 +0000 |
| commit | 4002ece8051e171332fdf0a53ac8ac1875f07c50 (patch) | |
| tree | 97e1c88f0dad993b1899eb59dc8cad68c95d2611 /linux-2.6.11-xen-sparse | |
| parent | 8204affb7f476eab36f8e20caa933aaada457373 (diff) | |
| parent | 43e04538d1498ea63ab2231af1707188ef3b53e4 (diff) | |
| download | xen-4002ece8051e171332fdf0a53ac8ac1875f07c50.tar.gz xen-4002ece8051e171332fdf0a53ac8ac1875f07c50.tar.bz2 xen-4002ece8051e171332fdf0a53ac8ac1875f07c50.zip | |
bitkeeper revision 1.1497 (428e7006d1s9u7R17UKdC7uB6M2U6g)
Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
Diffstat (limited to 'linux-2.6.11-xen-sparse')
| -rw-r--r-- | linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c | 5 | ||||
| -rw-r--r-- | linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/page.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c index b571bd6aaf..044568c42b 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c @@ -654,7 +654,10 @@ void __init mem_init(void) #else high_memory = (void *) __va(max_low_pfn * PAGE_SIZE); #endif - + printk("vmalloc area: %lx-%lx, maxmem %lx\n", + VMALLOC_START,VMALLOC_END,MAXMEM); + BUG_ON(VMALLOC_START > VMALLOC_END); + /* this will put all low memory onto the freelists */ totalram_pages += __free_all_bootmem(); /* XEN: init and count low-mem pages outside initial allocation. */ diff --git a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/page.h b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/page.h index 345b8264b8..af8ccd4652 100644 --- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/page.h +++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/page.h @@ -176,7 +176,7 @@ extern int sysctl_legacy_va_layout; #define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET) #define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE) -#define MAXMEM (-__PAGE_OFFSET-__VMALLOC_RESERVE) +#define MAXMEM (HYPERVISOR_VIRT_START-__PAGE_OFFSET-__VMALLOC_RESERVE) #define __pa(x) ((unsigned long)(x)-PAGE_OFFSET) #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET)) #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT) |