ia64/xen-unstable
changeset 4074:9599f091020d
bitkeeper revision 1.1159.266.1 (423070e8gpQdLbFsdaIs7JDG4U12ZA)
A couple of fixes for 2.4.
Signed-off-by: Keir Fraser <keir@xensource.com>
A couple of fixes for 2.4.
Signed-off-by: Keir Fraser <keir@xensource.com>
author | kaf24@firebug.cl.cam.ac.uk |
---|---|
date | Thu Mar 10 16:08:08 2005 +0000 (2005-03-10) |
parents | 030bbae1c84f |
children | 013c95ccecee |
files | linux-2.4.29-xen-sparse/arch/xen/mm/init.c linux-2.6.10-xen-sparse/drivers/xen/console/console.c |
line diff
1.1 --- a/linux-2.4.29-xen-sparse/arch/xen/mm/init.c Thu Mar 10 14:53:08 2005 +0000 1.2 +++ b/linux-2.4.29-xen-sparse/arch/xen/mm/init.c Thu Mar 10 16:08:08 2005 +0000 1.3 @@ -223,10 +223,9 @@ static void __init pagetable_init (void) 1.4 pmd_t *kpmd, *pmd; 1.5 pte_t *kpte, *pte, *pte_base; 1.6 1.7 - end = (unsigned long)__va(max_low_pfn * PAGE_SIZE); 1.8 - ram_end = (unsigned long)__va(xen_start_info.nr_pages * PAGE_SIZE); 1.9 - if ( ram_end > end ) 1.10 - ram_end = end; 1.11 + ram_end = end = (unsigned long)__va(max_low_pfn * PAGE_SIZE); 1.12 + if ( xen_start_info.nr_pages < max_low_pfn ) 1.13 + ram_end = (unsigned long)__va(xen_start_info.nr_pages * PAGE_SIZE); 1.14 1.15 pgd_base = init_mm.pgd; 1.16 i = __pgd_offset(PAGE_OFFSET);
2.1 --- a/linux-2.6.10-xen-sparse/drivers/xen/console/console.c Thu Mar 10 14:53:08 2005 +0000 2.2 +++ b/linux-2.6.10-xen-sparse/drivers/xen/console/console.c Thu Mar 10 16:08:08 2005 +0000 2.3 @@ -66,10 +66,6 @@ static enum { XC_OFF, XC_DEFAULT, XC_TTY 2.4 2.5 static int __init xencons_setup(char *str) 2.6 { 2.7 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) 2.8 - if (str[0] == '=') 2.9 - str++; 2.10 -#endif 2.11 if ( !strcmp(str, "tty") ) 2.12 xc_mode = XC_TTY; 2.13 else if ( !strcmp(str, "ttyS") ) 2.14 @@ -78,7 +74,7 @@ static int __init xencons_setup(char *st 2.15 xc_mode = XC_OFF; 2.16 return 1; 2.17 } 2.18 -__setup("xencons", xencons_setup); 2.19 +__setup("xencons=", xencons_setup); 2.20 2.21 /* The kernel and user-land drivers share a common transmit buffer. */ 2.22 #define WBUF_SIZE 4096