diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-03-18 17:17:51 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-03-18 17:17:51 +0000 |
| commit | f1382dc4850bb459d24a81c6cb0ef93ea7bd4a79 (patch) | |
| tree | 225271a3d5dcd4e9dea5ee393556abd754c964b1 /init/main.c | |
| parent | 135b00fc2e90e605ac2a96b20b0ebd93851a3f89 (diff) | |
o Merge with Linux 2.1.90.
o Divide L1 cache sizes by 1024 before printing, makes the numbers a
bit more credible ...
Diffstat (limited to 'init/main.c')
| -rw-r--r-- | init/main.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/init/main.c b/init/main.c index 85f56fda6..cc6657bbc 100644 --- a/init/main.c +++ b/init/main.c @@ -82,8 +82,6 @@ extern void dquot_init(void); extern void smp_setup(char *str, int *ints); extern void ioapic_pirq_setup(char *str, int *ints); extern void no_scroll(char *str, int *ints); -extern void swap_setup(char *str, int *ints); -extern void buff_setup(char *str, int *ints); extern void panic_setup(char *str, int *ints); extern void bmouse_setup(char *str, int *ints); extern void msmouse_setup(char *str, int *ints); @@ -282,7 +280,7 @@ extern void nfs_root_setup(char *str, int *ints); extern void ftape_setup(char *str, int *ints); #endif -#if defined(CONFIG_SYSVIPC) || defined(CONFIG_KERNELD) +#if defined(CONFIG_SYSVIPC) extern void ipc_init(void); #endif #ifdef CONFIG_MIPS_JAZZ @@ -502,8 +500,6 @@ static struct kernel_param cooked_params[] __initdata = { #if defined (CONFIG_AMIGA) || defined (CONFIG_ATARI) { "video=", video_setup }, #endif - { "swap=", swap_setup }, - { "buff=", buff_setup }, { "panic=", panic_setup }, { "console=", console_setup }, #ifdef CONFIG_VT @@ -1083,7 +1079,7 @@ __initfunc(asmlinkage void start_kernel(void)) inode_init(); file_table_init(); sock_init(); -#if defined(CONFIG_SYSVIPC) || defined(CONFIG_KERNELD) +#if defined(CONFIG_SYSVIPC) ipc_init(); #endif dquot_init(); @@ -1205,6 +1201,13 @@ static int init(void * unused) } #endif +#ifdef CONFIG_KMOD + { + extern int kmod_init(void); + kmod_init(); + } +#endif + setup(1); if (open("/dev/console", O_RDWR, 0) < 0) |