[Xen-changelog] A couple of fixes for 2.4.

[BitKeeper B. <ri...@su...>]

ChangeSet 1.1771.1.1, 2005/03/10 16:08:08+00:00, ka...@fi...

	A couple of fixes for 2.4.
	Signed-off-by: Keir Fraser <ke...@xe...>



 linux-2.4.29-xen-sparse/arch/xen/mm/init.c            |    7 +++----
 linux-2.6.10-xen-sparse/drivers/xen/console/console.c |    6 +-----
 2 files changed, 4 insertions(+), 9 deletions(-)


diff -Nru a/linux-2.4.29-xen-sparse/arch/xen/mm/init.c b/linux-2.4.29-xen-sparse/arch/xen/mm/init.c
--- a/linux-2.4.29-xen-sparse/arch/xen/mm/init.c	2005-03-10 12:06:01 -05:00
+++ b/linux-2.4.29-xen-sparse/arch/xen/mm/init.c	2005-03-10 12:06:01 -05:00
@@ -223,10 +223,9 @@
     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 -Nru a/linux-2.6.10-xen-sparse/drivers/xen/console/console.c b/linux-2.6.10-xen-sparse/drivers/xen/console/console.c
--- a/linux-2.6.10-xen-sparse/drivers/xen/console/console.c	2005-03-10 12:06:01 -05:00
+++ b/linux-2.6.10-xen-sparse/drivers/xen/console/console.c	2005-03-10 12:06:01 -05:00
@@ -66,10 +66,6 @@
 
 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 @@
         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