diff options
Diffstat (limited to 'init/main.c')
| -rw-r--r-- | init/main.c | 47 |
1 files changed, 40 insertions, 7 deletions
diff --git a/init/main.c b/init/main.c index 8f2adb5ab..3f40f8e90 100644 --- a/init/main.c +++ b/init/main.c @@ -70,6 +70,7 @@ extern void kswapd_setup(void); extern void init_IRQ(void); extern void init_modules(void); extern long console_init(long, long); +extern void init_inventory(void); extern void sock_init(void); extern void uidcache_init(void); extern unsigned long pci_init(unsigned long, unsigned long); @@ -78,6 +79,7 @@ extern long sbus_init(long, long); extern long powermac_init(unsigned long, unsigned long); extern void sysctl_init(void); extern void filescache_init(void); +extern void signals_init(void); extern void smp_setup(char *str, int *ints); extern void no_scroll(char *str, int *ints); @@ -86,6 +88,7 @@ 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); +extern void console_setup(char *str, int *ints); #ifdef CONFIG_PRINTER extern void lp_setup(char *str, int *ints); #endif @@ -223,8 +226,20 @@ extern void pcxx_setup(char *str, int *ints); #ifdef CONFIG_RISCOM8 extern void riscom8_setup(char *str, int *ints); #endif -#ifdef CONFIG_BAYCOM -extern void baycom_setup(char *str, int *ints); +#ifdef CONFIG_SPECIALIX +extern void specialix_setup(char *str, int *ints); +#endif +#ifdef CONFIG_DMASCC +extern void dmascc_setup(char *str, int *ints); +#endif +#ifdef CONFIG_BAYCOM_PAR +extern void baycom_par_setup(char *str, int *ints); +#endif +#ifdef CONFIG_BAYCOM_SER_FDX +extern void baycom_ser_fdx_setup(char *str, int *ints); +#endif +#ifdef CONFIG_BAYCOM_SER_HDX +extern void baycom_ser_hdx_setup(char *str, int *ints); #endif #ifdef CONFIG_SOUNDMODEM extern void sm_setup(char *str, int *ints); @@ -353,6 +368,7 @@ struct { { "swap=", swap_setup }, { "buff=", buff_setup }, { "panic=", panic_setup }, + { "console=", console_setup }, #ifdef CONFIG_VT { "no-scroll", no_scroll }, #endif @@ -552,8 +568,20 @@ struct { #ifdef CONFIG_RISCOM8 { "riscom8=", riscom8_setup }, #endif -#ifdef CONFIG_BAYCOM - { "baycom=", baycom_setup }, +#ifdef CONFIG_DMASCC + { "dmascc=", dmascc_setup }, +#endif +#ifdef CONFIG_SPECIALIX + { "specialix=", specialix_setup }, +#endif +#ifdef CONFIG_BAYCOM_PAR + { "baycom_par=", baycom_par_setup }, +#endif +#ifdef CONFIG_BAYCOM_SER_FDX + { "baycom_ser_fdx=", baycom_ser_fdx_setup }, +#endif +#ifdef CONFIG_BAYCOM_SER_HDX + { "baycom_ser_hdx=", baycom_ser_hdx_setup }, #endif #ifdef CONFIG_SOUNDMODEM { "soundmodem=", sm_setup }, @@ -694,6 +722,10 @@ __initfunc(static void parse_root_dev(char * line)) { "hdb", 0x0340 }, { "hdc", 0x1600 }, { "hdd", 0x1640 }, + { "hde", 0x2100 }, + { "hdf", 0x2140 }, + { "hdg", 0x2200 }, + { "hdh", 0x2240 }, { "sda", 0x0800 }, { "sdb", 0x0810 }, { "sdc", 0x0820 }, @@ -973,6 +1005,7 @@ __initfunc(asmlinkage void start_kernel(void)) dcache_init(); vma_init(); buffer_init(); + signals_init(); inode_init(); file_table_init(); sock_init(); @@ -1016,7 +1049,7 @@ static int do_linuxrc(void * shell) close(0);close(1);close(2); setsid(); - (void) open("/dev/tty1",O_RDWR,0); + (void) open("/dev/console",O_RDWR,0); (void) dup(0); (void) dup(0); return execve(shell, argv, envp_init); @@ -1100,8 +1133,8 @@ static int init(void * unused) setup(1); - if (open("/dev/console",O_RDWR,0) < 0) - printk("Unable to open an initial console.\n"); + if (open("/dev/console", O_RDWR, 0) < 0) + printk("Warning: unable to open an initial console.\n"); (void) dup(0); (void) dup(0); |