Update of /cvsroot/linuxconsole/ruby/linux/arch/alpha/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv13887/linux/arch/alpha/kernel
Modified Files:
setup.c
Log Message:
Synced to 2.5.8.
Index: setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/alpha/kernel/setup.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- setup.c 19 Mar 2002 19:08:03 -0000 1.8
+++ setup.c 16 Apr 2002 17:41:46 -0000 1.9
@@ -470,6 +470,7 @@
struct percpu_struct *cpu;
char *type_name, *var_name, *p;
void *kernel_end = _end; /* end of kernel */
+ char *args = command_line;
hwrpb = (struct hwrpb_struct*) __va(INIT_HWRPB->phys_addr);
boot_cpuid = hard_smp_processor_id();
@@ -507,7 +508,8 @@
/*
* Process command-line arguments.
*/
- for (p = strtok(command_line, " \t"); p ; p = strtok(NULL, " \t")) {
+ while ((p = strsep(&args, " \t")) != NULL) {
+ if (!*p) continue;
if (strncmp(p, "alpha_mv=", 9) == 0) {
vec = get_sysvec_byname(p+9);
continue;
@@ -526,7 +528,7 @@
}
}
- /* Replace the command line, now that we've killed it with strtok. */
+ /* Replace the command line, now that we've killed it with strsep. */
strcpy(command_line, saved_command_line);
/* If we want SRM console printk echoing early, do it now. */
|
