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

Commit 6153df7b authored by Len Brown's avatar Len Brown
Browse files

[ACPI] delete CONFIG_ACPI_PCI 

Delete the ability to build an ACPI kernel that does
not include PCI support.  When such a machine is created
and it requires a tuned kernel, send a patch.

http://bugzilla.kernel.org/show_bug.cgi?id=1364



Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 07fefe4c

arch/i386/defconfig

+0 −1
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ CONFIG_ACPI_THERMAL=y 
# CONFIG_ACPI_DEBUG is not set

CONFIG_ACPI_EC=y

CONFIG_ACPI_POWER=y

CONFIG_ACPI_PCI=y

CONFIG_ACPI_SYSTEM=y

# CONFIG_X86_PM_TIMER is not set

arch/i386/kernel/acpi/boot.c

+0 −9
Original line number Diff line number Diff line
@@ -66,13 +66,8 @@ static inline int ioapic_setup_disabled(void) 


#define PREFIX			"ACPI: "



#ifdef CONFIG_ACPI_PCI

int acpi_noirq __initdata;	/* skip ACPI IRQ initialization */

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

#else

int acpi_noirq __initdata = 1;

int acpi_pci_disabled __initdata = 1;

#endif

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



int acpi_lapic;
@@ -849,7 +844,6 @@ extern int acpi_force; 


#ifdef __i386__



#ifdef	CONFIG_ACPI_PCI

static int __init disable_acpi_irq(struct dmi_system_id *d)

{

	if (!acpi_force) {
@@ -869,7 +863,6 @@ static int __init disable_acpi_pci(struct dmi_system_id *d) 
	}

	return 0;

}

#endif



static int __init dmi_disable_acpi(struct dmi_system_id *d)

{
@@ -1017,7 +1010,6 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = { 
		     },

	 },



#ifdef	CONFIG_ACPI_PCI

	/*

	 * Boxes that need ACPI PCI IRQ routing disabled

	 */
@@ -1055,7 +1047,6 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = { 
		     DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"),

		     },

	 },

#endif

	{}

};

arch/i386/pci/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o 
obj-$(CONFIG_PCI_DIRECT)	+= direct.o



pci-y				:= fixup.o

pci-$(CONFIG_ACPI_PCI)		+= acpi.o

pci-$(CONFIG_ACPI)		+= acpi.o

pci-y				+= legacy.o irq.o



pci-$(CONFIG_X86_VISWS)		:= visws.o fixup.o

arch/i386/pci/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -1075,7 +1075,7 @@ static void pirq_penalize_isa_irq(int irq, int active) 


void pcibios_penalize_isa_irq(int irq, int active)

{

#ifdef CONFIG_ACPI_PCI

#ifdef CONFIG_ACPI

	if (!acpi_noirq)

		acpi_penalize_isa_irq(irq, active);

	else

arch/ia64/configs/bigsur_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ CONFIG_ACPI_PROCESSOR=m 
CONFIG_ACPI_THERMAL=m

# CONFIG_ACPI_DEBUG is not set

CONFIG_ACPI_POWER=y

CONFIG_ACPI_PCI=y

CONFIG_ACPI_SYSTEM=y



#