diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
| commit | 46e045034336a2cc90c1798cd7cc07af744ddfd6 (patch) | |
| tree | 3b9b51fc482e729f663d25333e77fbed9aaa939a /init | |
| parent | 31dc59d503a02e84c4de98826452acaeb56dc15a (diff) | |
Merge with Linux 2.3.99-pre4.
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/init/main.c b/init/main.c index 01834b424..c1e2ba8b9 100644 --- a/init/main.c +++ b/init/main.c @@ -519,19 +519,17 @@ asmlinkage void __init start_kernel(void) kmem_cache_init(); sti(); calibrate_delay(); -#if 0000 #ifdef CONFIG_BLK_DEV_INITRD - // FIXME, use the bootmem.h interface. - if (initrd_start && !initrd_below_start_ok && initrd_start < memory_start) { + if (initrd_start && !initrd_below_start_ok && + initrd_start < min_low_pfn << PAGE_SHIFT) { printk(KERN_CRIT "initrd overwritten (0x%08lx < 0x%08lx) - " - "disabling it.\n",initrd_start,memory_start); + "disabling it.\n",initrd_start,min_low_pfn << PAGE_SHIFT); initrd_start = 0; } #endif #ifdef CONFIG_BINFMT_IRIX init_inventory(); #endif -#endif /* 0000 */ mem_init(); kmem_cache_sizes_init(); #ifdef CONFIG_PROC_FS @@ -584,14 +582,6 @@ static int do_linuxrc(void * shell) return execve(shell, argv, envp_init); } -static int __init no_initrd(char *s) -{ - mount_initrd = 0; - return 1; -} - -__setup("noinitrd", no_initrd); - #endif struct task_struct *child_reaper = &init_task; |