diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
| commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
| tree | e01a457a4912a8553bc65524aa3125d51f29f810 /init | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index 748d1efd9..640826507 100644 --- a/init/main.c +++ b/init/main.c @@ -91,6 +91,7 @@ extern void ecard_init(void); extern void smp_setup(char *str, int *ints); #ifdef __i386__ extern void ioapic_pirq_setup(char *str, int *ints); +extern void ioapic_setup(char *str, int *ints); #endif extern void no_scroll(char *str, int *ints); extern void kbd_reset_setup(char *str, int *ints); @@ -552,7 +553,8 @@ static struct kernel_param cooked_params[] __initdata = { #ifdef __SMP__ { "nosmp", smp_setup }, { "maxcpus=", smp_setup }, -#ifdef __i386__ +#ifdef CONFIG_X86_IO_APIC + { "noapic", ioapic_setup }, { "pirq=", ioapic_pirq_setup }, #endif #endif @@ -1194,6 +1196,7 @@ asmlinkage void __init start_kernel(void) */ smp_init(); kernel_thread(init, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGHAND); + current->need_resched = 1; cpu_idle(NULL); } |