Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv2243
Modified Files:
setup.c
Log Message:
New place for kernel command line, not hardwired anymore
Index: setup.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/setup.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- setup.c 2001/09/14 20:30:21 1.16
+++ setup.c 2001/09/16 15:24:31 1.17
@@ -23,6 +23,7 @@
#define COMMAND_LINE_SIZE 256
+extern char *kernel_cmd_line; /* kernel command line from head.S */
static char command_line[COMMAND_LINE_SIZE];
char saved_command_line[COMMAND_LINE_SIZE];
@@ -64,16 +65,16 @@
unsigned long region_len;
/*
- * Locate the command line. - Don't have one yet...
- * atp -- have a temporary one.
- * Shouldn't we use strcpy here?
+ * save the command line from the boot block, before it gets
+ * stomped on.
*/
-// memcpy(command_line, "root=/dev/sda1 rw debug\0",24);
- memcpy(command_line, "root=/dev/nfs nfsroot=/tftpboot/vaxroot rw debug\0",55);
+ memcpy(command_line, kernel_cmd_line,(COMMAND_LINE_SIZE-1));
*cmdline_p = command_line;
/* Save unparsed command line copy for /proc/cmdline */
- memcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
+ memcpy(saved_command_line, command_line, COMMAND_LINE_SIZE-1);
saved_command_line[COMMAND_LINE_SIZE-1] = '\0';
+ printk("kernel_cmd_line %8p\n%s\n",kernel_cmd_line,kernel_cmd_line);
+
/* Get the SID */
vax_cpu.sid = __mfpr(PR_SID);
@@ -160,7 +161,6 @@
setup_smp();
#endif
- pte_ERROR( *(pte_t *)0x80291d80);
}
|
