Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e4be1ff authored by Yinghai Lu's avatar Yinghai Lu Committed by Greg Kroah-Hartman
Browse files

PCI: don't load acpi_php when acpi is disabled 



When acpi=off and pci=nomsi, don't load acpiphp.

Fixes this:

pci_hotplug: PCI Hot Plug PCI Core version: 0.5
acpiphp: ACPI Hot Plug PCI Controller Driver version: 0.5
ACPI Exception (utmutex-0263): AE_BAD_PARAMETER, Thread
FFFF81103CC54000 could not acquire Mutex [1] [20070126]

[akpm@linux-foundation.org: export acpi_pci_disabled for acpiphp.ko]
[akpm@linux-foundation.org: fix return statement]
Signed-off-by: default avatarYinghai Lu <yinghai.lu@sun.com>
Cc: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9dc625e7

arch/x86/kernel/acpi/boot.c

+2 −1
Original line number Diff line number Diff line
@@ -72,7 +72,8 @@ static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id) { return 
#define PREFIX			"ACPI: "



int acpi_noirq;				/* skip ACPI IRQ initialization */

int acpi_pci_disabled __initdata;	/* skip ACPI PCI scan and IRQ initialization */

int acpi_pci_disabled;		/* skip ACPI PCI scan and IRQ initialization */

EXPORT_SYMBOL(acpi_pci_disabled);

int acpi_ht __initdata = 1;	/* enable HT */



int acpi_lapic;

drivers/pci/hotplug/acpiphp_core.c

+6 −0
Original line number Diff line number Diff line
@@ -392,6 +392,9 @@ static int __init acpiphp_init(void) 
{

	info(DRIVER_DESC " version: " DRIVER_VERSION "\n");



	if (acpi_pci_disabled)

		return 0;



	acpiphp_debug = debug;



	/* read all the ACPI info from the system */
@@ -401,6 +404,9 @@ static int __init acpiphp_init(void) 


static void __exit acpiphp_exit(void)

{

	if (acpi_pci_disabled)

		return;



	/* deallocate internal data structures etc. */

	acpiphp_glue_exit();

}