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

Commit 6d1d07e4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus

parents d7a465b4 adbedd34

arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c

+7 −0
Original line number Diff line number Diff line
@@ -442,6 +442,13 @@ acpi_cpufreq_cpu_init ( 
			(u32) data->acpi_data.states[i].transition_latency);



	cpufreq_frequency_table_get_attr(data->freq_table, policy->cpu);

	

	/*

	 * the first call to ->target() should result in us actually

	 * writing something to the appropriate registers.

	 */

	data->resume = 1;

	

	return (result);



 err_freqfree:

arch/i386/pci/acpi.c

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ static int __init pci_acpi_init(void) 
	acpi_irq_penalty_init();

	pcibios_scanned++;

	pcibios_enable_irq = acpi_pci_irq_enable;

	pcibios_disable_irq = acpi_pci_irq_disable;



	if (pci_routeirq) {

		/*

arch/i386/pci/common.c

+6 −0
Original line number Diff line number Diff line
@@ -254,3 +254,9 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) 


	return pcibios_enable_irq(dev);

}



void pcibios_disable_device (struct pci_dev *dev)

{

	if (pcibios_disable_irq)

		pcibios_disable_irq(dev);

}

arch/i386/pci/irq.c

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ struct irq_router_handler { 
};



int (*pcibios_enable_irq)(struct pci_dev *dev) = NULL;

void (*pcibios_disable_irq)(struct pci_dev *dev) = NULL;



/*

 *  Check passed address for the PCI IRQ Routing Table signature

arch/i386/pci/pci.h

+1 −0
Original line number Diff line number Diff line
@@ -73,3 +73,4 @@ extern int pcibios_scanned; 
extern spinlock_t pci_config_lock;



extern int (*pcibios_enable_irq)(struct pci_dev *dev);

extern void (*pcibios_disable_irq)(struct pci_dev *dev);