diff options
author | Yinghai Lu <yinghai@kernel.org> | 2009-05-15 16:05:16 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-05-18 03:33:17 -0400 |
commit | 629e15d245f46bef9d26199b450f882f9437a8fe (patch) | |
tree | 8acc02c159e6b1a62753db4ba508932358ae5457 /arch/x86/kernel/mpparse.c | |
parent | 2759c3287de27266e06f1f4e82cbd2d65f6a044c (diff) |
x86, irq: update_mptable needs pci_routeirq
To get all device irq routing and to save them.
This is basically an implicit pci=routeirq enablement if (and on if)
the update_mptable boot option (which is off by default) has been
specified.
[ Impact: extend the update_mptable boot opion's scope ]
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
LKML-Reference: <4A0DB7B4.4060702@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/mpparse.c')
-rw-r--r-- | arch/x86/kernel/mpparse.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index cd2a41a7c45c..e6bf9d08e503 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/acpi.h> | 17 | #include <linux/acpi.h> |
18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
19 | #include <linux/smp.h> | 19 | #include <linux/smp.h> |
20 | #include <linux/pci.h> | ||
20 | 21 | ||
21 | #include <asm/mtrr.h> | 22 | #include <asm/mtrr.h> |
22 | #include <asm/mpspec.h> | 23 | #include <asm/mpspec.h> |
@@ -961,6 +962,9 @@ static int __initdata enable_update_mptable; | |||
961 | static int __init update_mptable_setup(char *str) | 962 | static int __init update_mptable_setup(char *str) |
962 | { | 963 | { |
963 | enable_update_mptable = 1; | 964 | enable_update_mptable = 1; |
965 | #ifdef CONFIG_PCI | ||
966 | pci_routeirq = 1; | ||
967 | #endif | ||
964 | return 0; | 968 | return 0; |
965 | } | 969 | } |
966 | early_param("update_mptable", update_mptable_setup); | 970 | early_param("update_mptable", update_mptable_setup); |
@@ -973,6 +977,9 @@ static int __initdata alloc_mptable; | |||
973 | static int __init parse_alloc_mptable_opt(char *p) | 977 | static int __init parse_alloc_mptable_opt(char *p) |
974 | { | 978 | { |
975 | enable_update_mptable = 1; | 979 | enable_update_mptable = 1; |
980 | #ifdef CONFIG_PCI | ||
981 | pci_routeirq = 1; | ||
982 | #endif | ||
976 | alloc_mptable = 1; | 983 | alloc_mptable = 1; |
977 | if (!p) | 984 | if (!p) |
978 | return 0; | 985 | return 0; |