Messages in this thread Patch in this message | | | Subject | Re: [PATCH 2/3] x86: remove duplicated parser for "pci=noacpi" | From | Sergio Monteiro Basto <> | Date | Thu, 07 Dec 2006 05:23:47 +0000 |
| |
On Sun, 2006-11-26 at 15:23 -0800, Yinghai Lu wrote: [PATCH 2/3] x86: remove duplicated parser for "pci=noacpi"
Remove "pci=noacpi" parse in acpi/boot.c, because it is duplicated with that in pci/common.c.
Signed-off-by: Yinghai Lu <yinghai.lu@amd.com>
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c index d12fb97..6d62dd1 100644 --- a/arch/i386/kernel/acpi/boot.c +++ b/arch/i386/kernel/acpi/boot.c @@ -1285,15 +1293,6 @@ static int __init parse_acpi(char *arg) } early_param("acpi", parse_acpi); -/* FIXME: Using pci= for an ACPI parameter is a travesty. */ -static int __init parse_pci(char *arg) -{ - if (arg && strcmp(arg, "noacpi") == 0) - acpi_disable_pci(); - return 0; -} -early_param("pci", parse_pci); - #ifdef CONFIG_X86_IO_APIC static int __init parse_acpi_skip_timer_override(char *arg) { diff --git a/arch/i386/pci/common.c b/arch/i386/pci/common.c index cdfcf97..6d5b70a 100644 --- a/arch/i386/pci/common.c +++ b/arch/i386/pci/common.c @@ -294,7 +294,7 @@ char * __devinit pcibios_setup(char *str) } #endif else if (!strcmp(str, "noacpi")) { - acpi_noirq_set(); + acpi_disable_pci(); return NULL; } else if (!strcmp(str, "noearly")) {
/include/asm-x86_64/acpi.h (and asm-i386) acpi_disable_pci :
#ifdef CONFIG_ACPI static inline void acpi_noirq_set(void) { acpi_noirq = 1; } static inline void acpi_disable_pci(void) { acpi_pci_disabled = 1; acpi_noirq_set(); } #else /* !CONFIG_ACPI */ #define acpi_ioapic 0 static inline void acpi_noirq_set(void) { } static inline void acpi_disable_pci(void) { } so first hunk of the patch doesn't have nothing in common with second , and it is different disable acpi_irqs than disable all acpi, callacpi_disable_pci () is acpi=off.
My main goal when I read this mail was delete acpi=noirq or pci=noacpi because is a redundant boot option which just make confusions.
I have to go (sleep)
Thanks,
-- Sérgio M.B. [unhandled content-type:application/x-pkcs7-signature] | |