Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 (00c1bd54) · Commits · e / devices / android_kernel_xiaomi_markw

arch/i386/kernel/acpi/boot.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -638,6 +638,13 @@ static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
		return 0;

		pmtmr_ioport = fadt->xpm_tmr_blk.address;
		/*
		* "X" fields are optional extensions to the original V1.0
		* fields, so we must selectively expand V1.0 fields if the
		* corresponding X field is zero.
		*/
		if (!pmtmr_ioport)
		pmtmr_ioport = fadt->V1_pm_tmr_blk;
		} else {
		/* FADT rev. 1 */
		pmtmr_ioport = fadt->V1_pm_tmr_blk;

drivers/acpi/Kconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -197,7 +197,6 @@ config ACPI_ASUS
		config ACPI_IBM
		tristate "IBM ThinkPad Laptop Extras"
		depends on X86
		default y
		---help---
		This is a Linux ACPI driver for the IBM ThinkPad laptops. It adds
		support for Fn-Fx key combinations, Bluetooth control, video

drivers/acpi/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@ EXTRA_CFLAGS += $(ACPI_CFLAGS)
		# ACPI Boot-Time Table Parsing
		#
		obj-y += tables.o
		obj-y += blacklist.o
		obj-$(CONFIG_X86) += blacklist.o

		#
		# ACPI Core Subsystem (Interpreter)

drivers/acpi/processor_core.c

+15 −0

Original line number	Diff line number	Diff line
		@@ -543,6 +543,8 @@ static int acpi_processor_get_info(struct acpi_processor *pr)
		return_VALUE(0);
		}

		static void *processor_device_array[NR_CPUS];

		static int acpi_processor_start(struct acpi_device *device)
		{
		int result = 0;
		@@ -561,6 +563,19 @@ static int acpi_processor_start(struct acpi_device *device)

		BUG_ON((pr->id >= NR_CPUS) \|\| (pr->id < 0));

		/*
		* Buggy BIOS check
		* ACPI id of processors can be reported wrongly by the BIOS.
		* Don't trust it blindly
		*/
		if (processor_device_array[pr->id] != NULL &&
		processor_device_array[pr->id] != (void *)device) {
		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "BIOS reporting wrong ACPI id"
		"for the processor\n"));
		return_VALUE(-ENODEV);
		}
		processor_device_array[pr->id] = (void *)device;

		processors[pr->id] = pr;

		result = acpi_processor_add_fs(device);

drivers/acpi/processor_idle.c

+24 −5

Original line number	Diff line number	Diff line
		@@ -280,6 +280,16 @@ static void acpi_processor_idle(void)

		cx->usage++;

		#ifdef CONFIG_HOTPLUG_CPU
		/*
		* Check for P_LVL2_UP flag before entering C2 and above on
		* an SMP system. We do it here instead of doing it at _CST/P_LVL
		* detection phase, to work cleanly with logical CPU hotplug.
		*/
		if ((cx->type != ACPI_STATE_C1) && (num_online_cpus() > 1) &&
		!pr->flags.has_cst && acpi_fadt.plvl2_up)
		cx->type = ACPI_STATE_C1;
		#endif
		/*
		* Sleep:
		* ------
		@@ -534,6 +544,15 @@ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
		pr->power.states[ACPI_STATE_C0].valid = 1;
		pr->power.states[ACPI_STATE_C1].valid = 1;

		#ifndef CONFIG_HOTPLUG_CPU
		/*
		* Check for P_LVL2_UP flag before entering C2 and above on
		* an SMP system.
		*/
		if ((num_online_cpus() > 1) && acpi_fadt.plvl2_up)
		return_VALUE(-ENODEV);
		#endif

		/* determine C2 and C3 address from pblk */
		pr->power.states[ACPI_STATE_C2].address = pr->pblk + 4;
		pr->power.states[ACPI_STATE_C3].address = pr->pblk + 5;
		@@ -690,7 +709,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)

		/* Validate number of power states discovered */
		if (pr->power.count < 2)
		status = -ENODEV;
		status = -EFAULT;

		end:
		acpi_os_free(buffer.pointer);
		@@ -841,11 +860,11 @@ static int acpi_processor_get_power_info(struct acpi_processor *pr)
		* this function */

		result = acpi_processor_get_power_info_cst(pr);
		if ((result) \|\| (acpi_processor_power_verify(pr) < 2)) {
		if (result == -ENODEV)
		result = acpi_processor_get_power_info_fadt(pr);

		if ((result) \|\| (acpi_processor_power_verify(pr) < 2))
		result = acpi_processor_get_power_info_default_c1(pr);
		}

		/*
		* Set Default Policy