Update of /cvsroot/gc-linux/linux/init
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24035/init
Modified Files:
main.c
Log Message:
Merged 2.6.5
Index: main.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/init/main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- main.c 14 Mar 2004 23:45:45 -0000 1.5
+++ main.c 24 Apr 2004 18:31:45 -0000 1.6
@@ -18,7 +18,6 @@
#include <linux/devfs_fs_kernel.h>
#include <linux/kernel.h>
#include <linux/syscalls.h>
-#include <linux/unistd.h>
#include <linux/string.h>
#include <linux/ctype.h>
#include <linux/delay.h>
@@ -42,6 +41,7 @@
#include <linux/writeback.h>
#include <linux/cpu.h>
#include <linux/efi.h>
+#include <linux/unistd.h>
#include <asm/io.h>
#include <asm/bugs.h>
@@ -156,8 +156,11 @@
p = &__setup_start;
do {
int n = strlen(p->str);
- if (!strncmp(line,p->str,n)) {
- if (p->setup_func(line+n))
+ if (!strncmp(line, p->str, n)) {
+ if (!p->setup_func) {
+ printk(KERN_WARNING "Parameter %s is obsolete, ignored\n", p->str);
+ return 1;
+ } else if (p->setup_func(line + n))
return 1;
}
p++;
@@ -409,6 +412,7 @@
con_puts("");
#endif
lock_kernel();
+ page_address_init();
printk(linux_banner);
setup_arch(&command_line);
setup_per_cpu_areas();
@@ -452,7 +456,6 @@
initrd_start = 0;
}
#endif
- page_address_init();
mem_init();
kmem_cache_init();
if (late_time_init)
@@ -615,11 +618,11 @@
unlock_kernel();
system_running = 1;
- if (open("/dev/console", O_RDWR, 0) < 0)
+ if (sys_open("/dev/console", O_RDWR, 0) < 0)
printk("Warning: unable to open an initial console.\n");
- (void) dup(0);
- (void) dup(0);
+ (void) sys_dup(0);
+ (void) sys_dup(0);
/*
* We try each of these until one succeeds.
|
