ia64/xen-unstable

changeset 5067:6640eb3cb41d

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
author kaf24@firebug.cl.cam.ac.uk
date Fri May 20 23:17:26 2005 +0000 (2005-05-20)
parents fada74b4becd c4353a81ae5b
children 43d7cfe99358
files BitKeeper/etc/logging_ok linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/page.h
line diff
     2.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c	Fri May 20 23:13:11 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c	Fri May 20 23:17:26 2005 +0000
     2.3 @@ -654,7 +654,10 @@ void __init mem_init(void)
     2.4  #else
     2.5  	high_memory = (void *) __va(max_low_pfn * PAGE_SIZE);
     2.6  #endif
     2.7 -
     2.8 +	printk("vmalloc area: %lx-%lx, maxmem %lx\n",
     2.9 +	       VMALLOC_START,VMALLOC_END,MAXMEM);
    2.10 +	BUG_ON(VMALLOC_START > VMALLOC_END);
    2.11 +	
    2.12  	/* this will put all low memory onto the freelists */
    2.13  	totalram_pages += __free_all_bootmem();
    2.14  	/* XEN: init and count low-mem pages outside initial allocation. */
     3.1 --- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/page.h	Fri May 20 23:13:11 2005 +0000
     3.2 +++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/page.h	Fri May 20 23:17:26 2005 +0000
     3.3 @@ -176,7 +176,7 @@ extern int sysctl_legacy_va_layout;
     3.4  
     3.5  #define PAGE_OFFSET		((unsigned long)__PAGE_OFFSET)
     3.6  #define VMALLOC_RESERVE		((unsigned long)__VMALLOC_RESERVE)
     3.7 -#define MAXMEM			(-__PAGE_OFFSET-__VMALLOC_RESERVE)
     3.8 +#define MAXMEM			(HYPERVISOR_VIRT_START-__PAGE_OFFSET-__VMALLOC_RESERVE)
     3.9  #define __pa(x)			((unsigned long)(x)-PAGE_OFFSET)
    3.10  #define __va(x)			((void *)((unsigned long)(x)+PAGE_OFFSET))
    3.11  #define pfn_to_kaddr(pfn)      __va((pfn) << PAGE_SHIFT)