bitkeeper revision 1.1159.266.1 (423070e8gpQdLbFsdaIs7JDG4U12ZA)

A couple of fixes for 2.4.
Signed-off-by: Keir Fraser <keir@xensource.com>

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 a2363d0cce8b7300979ad420fbdf5e04e0b9db68..40a5af9273b9ab027abf3dc37c7369712907461d 100644 (file)
--- 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 b9c09c3d73da003644f1ec9479c4eb43efe97961..f1fe3c517fae3fa6701db06f5c7b514d7fa1698a 100644 (file)
--- 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