Messages in this thread Patch in this message | | | From | Yinghai Lu <> | Subject | [PATCH] x86: check command line when CONFIG_X86_MPPARSE is not set | Date | Fri, 20 Jun 2008 07:42:35 -0700 |
| |
we can not use acpi=off, acpi=noirq and pci=noacpi when mps support is not there
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
--- arch/x86/kernel/acpi/boot.c | 12 ++++++++++++ arch/x86/kernel/setup_32.c | 2 ++ arch/x86/kernel/setup_64.c | 2 ++ include/linux/acpi.h | 5 +++++ 4 files changed, 21 insertions(+)
Index: linux-2.6/arch/x86/kernel/acpi/boot.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/acpi/boot.c +++ linux-2.6/arch/x86/kernel/acpi/boot.c @@ -1740,6 +1740,18 @@ static int __init parse_pci(char *arg) } early_param("pci", parse_pci); +void __init acpi_mps_check(void) +{ +#if defined(CONFIG_X86_LOCAL_APIC) && !defined(CONFIG_X86_MPPARSE) +/* mptable code is not built-in*/ + if (acpi_disabled || acpi_noirq) { + printk(KERN_ERR "MPS support code is not built-in\n", + "so can not use acpi=off or acpi=noirq or pci=noacpi\n"); + panic("MPS support is not built-in\n"); + } +#endif +} + #ifdef CONFIG_X86_IO_APIC static int __init parse_acpi_skip_timer_override(char *arg) { Index: linux-2.6/arch/x86/kernel/setup_32.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/setup_32.c +++ linux-2.6/arch/x86/kernel/setup_32.c @@ -754,6 +754,8 @@ void __init setup_arch(char **cmdline_p) early_dump_pci_devices(); #endif + acpi_mps_check(); + finish_e820_parsing(); probe_roms(); Index: linux-2.6/arch/x86/kernel/setup_64.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/setup_64.c +++ linux-2.6/arch/x86/kernel/setup_64.c @@ -359,6 +359,8 @@ void __init setup_arch(char **cmdline_p) early_dump_pci_devices(); #endif + acpi_mps_check(); + #ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT if (init_ohci1394_dma_early) init_ohci1394_dma_on_all_controllers(); Index: linux-2.6/include/linux/acpi.h =================================================================== --- linux-2.6.orig/include/linux/acpi.h +++ linux-2.6/include/linux/acpi.h @@ -82,6 +82,7 @@ char * __acpi_map_table (unsigned long p int early_acpi_boot_init(void); int acpi_boot_init (void); int acpi_boot_table_init (void); +void acpi_mps_check (void); int acpi_numa_init (void); int acpi_table_init (void); @@ -250,6 +251,10 @@ static inline int acpi_boot_table_init(v return 0; } +static inline void acpi_mps_check(void) +{ +} + static inline int acpi_check_resource_conflict(struct resource *res) { return 0;
| |