Merge branch 'misc' into release (8a3f257c) · Commits · e / devices / android_kernel_oneplus_sm7250

MAINTAINERS

+1 −4

Original line number	Diff line number	Diff line
		@@ -4291,10 +4291,7 @@ W: http://sourceforge.net/projects/tlan/
		S: Maintained

		TOSHIBA ACPI EXTRAS DRIVER
		P: John Belmonte
		M: toshiba_acpi@memebeam.org
		W: http://memebeam.org/toys/ToshibaAcpiDriver
		S: Maintained
		S: Orphan

		TOSHIBA SMM DRIVER
		P: Jonathan Buzzard

arch/x86/kernel/acpi/boot.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1548,7 +1548,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)

		/*
		* If your system is blacklisted here, but you find that acpi=force
		* works for you, please contact acpi-devel@sourceforge.net
		* works for you, please contact linux-acpi@vger.kernel.org
		*/
		static struct dmi_system_id __initdata acpi_dmi_table[] = {
		/*

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -680,6 +680,18 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
		perf->states[i].transition_latency * 1000;
		}

		/* Check for high latency (>20uS) from buggy BIOSes, like on T42 */
		if (perf->control_register.space_id == ACPI_ADR_SPACE_FIXED_HARDWARE &&
		policy->cpuinfo.transition_latency > 20 * 1000) {
		static int print_once;
		policy->cpuinfo.transition_latency = 20 * 1000;
		if (!print_once) {
		print_once = 1;
		printk(KERN_INFO "Capping off P-state tranision latency"
		" at 20 uS\n");
		}
		}

		data->max_freq = perf->states[0].core_frequency * 1000;
		/* table init */
		for (i=0; i<perf->state_count; i++) {

drivers/acpi/dock.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1146,9 +1146,10 @@ static int __init dock_init(void)
		static void __exit dock_exit(void)
		{
		struct dock_station *dock_station;
		struct dock_station *tmp;

		unregister_acpi_bus_notifier(&dock_acpi_notifier);
		list_for_each_entry(dock_station, &dock_stations, sibiling)
		list_for_each_entry_safe(dock_station, tmp, &dock_stations, sibiling)
		dock_remove(dock_station);
		}

drivers/acpi/pci_irq.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -86,7 +86,7 @@ static struct acpi_prt_entry acpi_pci_irq_find_prt_entry(struct pci_dev dev,
		}

		/* http://bugzilla.kernel.org/show_bug.cgi?id=4773 */
		static struct dmi_system_id medion_md9580[] = {
		static const struct dmi_system_id medion_md9580[] = {
		{
		.ident = "Medion MD9580-F laptop",
		.matches = {
		@@ -98,7 +98,7 @@ static struct dmi_system_id medion_md9580[] = {
		};

		/* http://bugzilla.kernel.org/show_bug.cgi?id=5044 */
		static struct dmi_system_id dell_optiplex[] = {
		static const struct dmi_system_id dell_optiplex[] = {
		{
		.ident = "Dell Optiplex GX1",
		.matches = {
		@@ -110,7 +110,7 @@ static struct dmi_system_id dell_optiplex[] = {
		};

		/* http://bugzilla.kernel.org/show_bug.cgi?id=10138 */
		static struct dmi_system_id hp_t5710[] = {
		static const struct dmi_system_id hp_t5710[] = {
		{
		.ident = "HP t5710",
		.matches = {
		@@ -123,13 +123,13 @@ static struct dmi_system_id hp_t5710[] = {
		};

		struct prt_quirk {
		struct dmi_system_id *system;
		const struct dmi_system_id *system;
		unsigned int segment;
		unsigned int bus;
		unsigned int device;
		unsigned char pin;
		char source; / according to BIOS */
		char *actual_source;
		const char source; / according to BIOS */
		const char *actual_source;
		};

		#define PCI_INTX_PIN(c) (c - 'A' + 1)
		@@ -139,7 +139,7 @@ struct prt_quirk {
		* interrupt at the listed segment/bus/device/pin is connected to the first
		* link device, but it is actually connected to the second.
		*/
		static struct prt_quirk prt_quirks[] = {
		static const struct prt_quirk prt_quirks[] = {
		{ medion_md9580, 0, 0, 9, PCI_INTX_PIN('A'),
		"\\_SB_.PCI0.ISA_.LNKA",
		"\\_SB_.PCI0.ISA_.LNKB"},
		@@ -155,7 +155,7 @@ static void do_prt_fixups(struct acpi_prt_entry *entry,
		struct acpi_pci_routing_table *prt)
		{
		int i;
		struct prt_quirk *quirk;
		const struct prt_quirk *quirk;

		for (i = 0; i < ARRAY_SIZE(prt_quirks); i++) {
		quirk = &prt_quirks[i];