diff options
| author | Yinghai Lu | 2009-02-15 11:54:03 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2009-02-16 09:36:58 +0100 |
| commit | 3bd25d0fa3ed588a6735b815cb0c146c23888ace (patch) | |
| tree | e2d3e2f4bccc519d712e0efb6ae674b0f86551e3 /arch/x86/kernel/io_apic.c | |
| parent | x86: make 32bit to call enable_IO_APIC early like 64bit (diff) | |
| download | kernel-qcow2-linux-3bd25d0fa3ed588a6735b815cb0c146c23888ace.tar.gz kernel-qcow2-linux-3bd25d0fa3ed588a6735b815cb0c146c23888ace.tar.xz kernel-qcow2-linux-3bd25d0fa3ed588a6735b815cb0c146c23888ace.zip | |
x86: pre init pirq_entries[]
Impact: cleanup
set default value early - this allows the removal of a number
of dynamic initialization codepaths, and an #ifdef.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/io_apic.c')
| -rw-r--r-- | arch/x86/kernel/io_apic.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c index 0b7cde3da48b..a89878e08a42 100644 --- a/arch/x86/kernel/io_apic.c +++ b/arch/x86/kernel/io_apic.c @@ -813,8 +813,9 @@ static void clear_IO_APIC (void) */ #define MAX_PIRQS 8 -static int pirq_entries [MAX_PIRQS]; -static int pirqs_enabled; +static int pirq_entries[MAX_PIRQS] = { + [0 ... MAX_PIRQS - 1] = -1 +}; static int __init ioapic_pirq_setup(char *str) { @@ -823,10 +824,6 @@ static int __init ioapic_pirq_setup(char *str) get_options(str, ARRAY_SIZE(ints), ints); - for (i = 0; i < MAX_PIRQS; i++) - pirq_entries[i] = -1; - - pirqs_enabled = 1; apic_printk(APIC_VERBOSE, KERN_INFO "PIRQ redirection, working around broken MP-BIOS.\n"); max = MAX_PIRQS; @@ -1976,13 +1973,6 @@ void __init enable_IO_APIC(void) int apic; unsigned long flags; -#ifdef CONFIG_X86_32 - int i; - if (!pirqs_enabled) - for (i = 0; i < MAX_PIRQS; i++) - pirq_entries[i] = -1; -#endif - /* * The number of IO-APIC IRQ registers (== #pins): */ |