diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
| commit | 012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch) | |
| tree | 87efc733f9b164e8c85c0336f92c8fb7eff6d183 /init | |
| parent | 625a1589d3d6464b5d90b8a0918789e3afffd220 (diff) | |
Merge with Linux 2.4.0-test9. Please check DECstation, I had a number
of rejects to fixup while integrating Linus patches. I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages. I commit this anyway
since I found that the last CVS versions had the same problem.
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 5 | ||||
| -rw-r--r-- | init/version.c | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/init/main.c b/init/main.c index c4422fe0d..67730c994 100644 --- a/init/main.c +++ b/init/main.c @@ -588,7 +588,7 @@ asmlinkage void __init start_kernel(void) * make syscalls (and thus be locked). */ smp_init(); - kernel_thread(init, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGHAND); + kernel_thread(init, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGNAL); unlock_kernel(); current->need_resched = 1; cpu_idle(); @@ -731,9 +731,6 @@ static void __init do_basic_setup(void) while (pid != wait(&i)); if (MAJOR(real_root_dev) != RAMDISK_MAJOR || MINOR(real_root_dev) != 0) { -#ifdef CONFIG_BLK_DEV_MD - md_run_setup(); -#endif error = change_root(real_root_dev,"/initrd"); if (error) printk(KERN_ERR "Change root to /initrd: " diff --git a/init/version.c b/init/version.c index 08d91a3b9..2ec3dee25 100644 --- a/init/version.c +++ b/init/version.c @@ -14,7 +14,7 @@ #define version(a) Version_ ## a #define version_string(a) version(a) -int version_string(LINUX_VERSION_CODE) = 0; +int version_string(LINUX_VERSION_CODE); struct new_utsname system_utsname = { UTS_SYSNAME, UTS_NODENAME, UTS_RELEASE, UTS_VERSION, |