diff -urpN -X /home/fletch/.diff.exclude 460-tcp_speedup/include/linux/early_printk.h 465-early_printk_fix/include/linux/early_printk.h
--- 460-tcp_speedup/include/linux/early_printk.h	Sun Apr 20 21:09:39 2003
+++ 465-early_printk_fix/include/linux/early_printk.h	Sun Apr 20 22:18:34 2003
@@ -35,12 +35,12 @@
 
 
 void early_printk(const char *fmt, ...);
-int __init setup_early_printk(char *opt); 
+int __init setup_early_printk(); 
 
 #else
 
 #define early_printk(...) do {} while(0)
-#define setup_early_printk(X) do {} while(0)
+#define setup_early_printk() do {} while(0)
 
 #endif
 
diff -urpN -X /home/fletch/.diff.exclude 460-tcp_speedup/init/main.c 465-early_printk_fix/init/main.c
--- 460-tcp_speedup/init/main.c	Sun Apr 20 22:07:31 2003
+++ 465-early_printk_fix/init/main.c	Sun Apr 20 22:18:34 2003
@@ -401,7 +401,8 @@ asmlinkage void __init start_kernel(void
  */
 	lock_kernel();
 	printk(linux_banner);
-	setup_early_printk(&command_line);
+	setup_early_printk();
+	
 	setup_arch(&command_line);
 	setup_per_cpu_areas();
 
diff -urpN -X /home/fletch/.diff.exclude 460-tcp_speedup/kernel/early_printk.c 465-early_printk_fix/kernel/early_printk.c
--- 460-tcp_speedup/kernel/early_printk.c	Sun Apr 20 21:09:39 2003
+++ 465-early_printk_fix/kernel/early_printk.c	Sun Apr 20 22:18:34 2003
@@ -4,6 +4,8 @@
 #include <linux/string.h>
 #include <linux/early_printk.h>
 #include <asm/io.h>
+#include <asm/setup.h>
+#include <asm/pgtable.h>
 
 /* Simple VGA output */
 
@@ -146,11 +148,18 @@ void early_printk(const char *fmt, ...)
 
 static int keep_early; 
 
-int __init setup_early_printk(char *opt) 
+int __init setup_early_printk(void) 
 {  
 	char *space, *s;
 	char buf[256];
+	char cmd[COMMAND_LINE_SIZE];
+	char *opt;
 
+	/* Get our own copy of the cmd line */
+	memcpy(cmd, COMMAND_LINE, COMMAND_LINE_SIZE);
+	cmd[COMMAND_LINE_SIZE-1] = '\0';
+	opt = cmd;
+	
 	s = strstr(opt, "earlyprintk=");
 	if (s == NULL)
 		return -1;
@@ -182,7 +191,7 @@ int __init setup_early_printk(char *opt)
 	}
 	early_console_initialized = 1;
 	register_console(early_console);
-	early_printk( "early printk console registered\n" );
+	printk("early printk console registered\n");
 	return 0;
 }