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

Commit 727e6e93 authored by Dave Airlie's avatar Dave Airlie Committed by Dave Airlie
Browse files

Merge ../linux-2.6/

parents bdf242ee 889371f6

Documentation/fb/vesafb.txt

+15 −1
Original line number Diff line number Diff line
@@ -144,7 +144,21 @@ vgapal Use the standard vga registers for palette changes. 
	This is the default.

pmipal	Use the protected mode interface for palette changes.



mtrr	setup memory type range registers for the vesafb framebuffer.

mtrr:n	setup memory type range registers for the vesafb framebuffer

	where n:

	      0 - disabled (equivalent to nomtrr)

	      1 - uncachable

	      2 - write-back

	      3 - write-combining (default)

	      4 - write-through



	If you see the following in dmesg, choose the type that matches the

	old one. In this example, use "mtrr:2".

...

mtrr: type mismatch for e0000000,8000000 old: write-back new: write-combining

...



nomtrr  disable mtrr



vremap:n

        remap 'n' MiB of video RAM. If 0 or not specified, remap memory

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