diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-03-10 16:08:14 +0000 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-03-10 16:08:14 +0000 |
| commit | 580fd7ddd2a31b73a2123c65619fe9f07c760641 (patch) | |
| tree | 369fa301e15646185e53108bc57be923ca4fab3d | |
| parent | 96839bbe7ea767a81431f1d1e27ba2989601d90f (diff) | |
| parent | de18760cd769d9c072e43c2f586b3a9734fa67b6 (diff) | |
| download | xen-580fd7ddd2a31b73a2123c65619fe9f07c760641.tar.gz xen-580fd7ddd2a31b73a2123c65619fe9f07c760641.tar.bz2 xen-580fd7ddd2a31b73a2123c65619fe9f07c760641.zip | |
bitkeeper revision 1.1159.258.39 (423070eemKuJ-8uTpcciD8RIvSEbmg)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
| -rw-r--r-- | linux-2.4.29-xen-sparse/arch/xen/mm/init.c | 7 | ||||
| -rw-r--r-- | linux-2.6.10-xen-sparse/drivers/xen/console/console.c | 6 |
2 files changed, 4 insertions, 9 deletions
diff --git a/linux-2.4.29-xen-sparse/arch/xen/mm/init.c b/linux-2.4.29-xen-sparse/arch/xen/mm/init.c index a2363d0cce..40a5af9273 100644 --- a/linux-2.4.29-xen-sparse/arch/xen/mm/init.c +++ b/linux-2.4.29-xen-sparse/arch/xen/mm/init.c @@ -223,10 +223,9 @@ static void __init pagetable_init (void) pmd_t *kpmd, *pmd; pte_t *kpte, *pte, *pte_base; - end = (unsigned long)__va(max_low_pfn * PAGE_SIZE); - ram_end = (unsigned long)__va(xen_start_info.nr_pages * PAGE_SIZE); - if ( ram_end > end ) - ram_end = end; + ram_end = end = (unsigned long)__va(max_low_pfn * PAGE_SIZE); + if ( xen_start_info.nr_pages < max_low_pfn ) + ram_end = (unsigned long)__va(xen_start_info.nr_pages * PAGE_SIZE); pgd_base = init_mm.pgd; i = __pgd_offset(PAGE_OFFSET); diff --git a/linux-2.6.10-xen-sparse/drivers/xen/console/console.c b/linux-2.6.10-xen-sparse/drivers/xen/console/console.c index b9c09c3d73..f1fe3c517f 100644 --- a/linux-2.6.10-xen-sparse/drivers/xen/console/console.c +++ b/linux-2.6.10-xen-sparse/drivers/xen/console/console.c @@ -66,10 +66,6 @@ static enum { XC_OFF, XC_DEFAULT, XC_TTY, XC_SERIAL } xc_mode = XC_DEFAULT; static int __init xencons_setup(char *str) { -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - if (str[0] == '=') - str++; -#endif if ( !strcmp(str, "tty") ) xc_mode = XC_TTY; else if ( !strcmp(str, "ttyS") ) @@ -78,7 +74,7 @@ static int __init xencons_setup(char *str) xc_mode = XC_OFF; return 1; } -__setup("xencons", xencons_setup); +__setup("xencons=", xencons_setup); /* The kernel and user-land drivers share a common transmit buffer. */ #define WBUF_SIZE 4096 |