patch-2.4.21 linux-2.4.21/arch/x86_64/kernel/head64.c

• Lines: 34
• Date: 2003-06-13 07:51:32.000000000 -0700
• Orig file: linux-2.4.20/arch/x86_64/kernel/head64.c
• Orig date: 2002-11-28 15:53:12.000000000 -0800

diff -urN linux-2.4.20/arch/x86_64/kernel/head64.c linux-2.4.21/arch/x86_64/kernel/head64.c
@@ -3,9 +3,10 @@
  *
  *  Copyright (C) 2000 Andrea Arcangeli <andrea@suse.de> SuSE
  *
- *  $Id: head64.c,v 1.25 2002/07/01 08:01:19 ak Exp $
+ *  $Id: head64.c,v 1.27 2003/03/31 15:12:07 ak Exp $
  */
 
+#include <asm/bootsetup.h>
 #include <linux/init.h>
 #include <linux/linkage.h>
 #include <linux/types.h>
@@ -50,7 +51,7 @@
 		printk("old bootloader convention, maybe loadlin?\n");
 	}
 	command_line = (char *) ((u64)(new_data));
-	memcpy(saved_command_line, command_line, 2048);
+	memcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
 	printk("Bootdata ok (command line is %s)\n", saved_command_line);	
 }
 
@@ -81,6 +82,12 @@
 	s = strstr(saved_command_line, "earlyprintk="); 
 	if (s != NULL)
 		setup_early_printk(s+12); 
+#ifdef CONFIG_DISCONTIGMEM
+	extern int numa_setup(char *);
+	s = strstr(saved_command_line, "numa=");
+	if (s != NULL)
+		numa_setup(s+5);
+#endif		
 	early_printk("booting x86_64 kernel... ");
 	setup_boot_cpu_data();
 	start_kernel();