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

Commit be64c970 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  ACPI: Be in TS_POLLING state during mwait based C-state entry
  ACPI: Fix regression where _PPC is not read at boot even when ignore_ppc=0
  acer-wmi: Respect current backlight level when loading
parents 34e3f91b b2cb9dcb

drivers/acpi/processor_idle.c

+16 −12
Original line number Diff line number Diff line
@@ -880,12 +880,14 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev, 
		return(acpi_idle_enter_c1(dev, state));



	local_irq_disable();

	if (cx->entry_method != ACPI_CSTATE_FFH) {

		current_thread_info()->status &= ~TS_POLLING;

		/*

		 * TS_POLLING-cleared state must be visible before we test

		 * NEED_RESCHED:

		 */

		smp_mb();

	}



	if (unlikely(need_resched())) {

		current_thread_info()->status |= TS_POLLING;
@@ -965,12 +967,14 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev, 
	}



	local_irq_disable();

	if (cx->entry_method != ACPI_CSTATE_FFH) {

		current_thread_info()->status &= ~TS_POLLING;

		/*

		 * TS_POLLING-cleared state must be visible before we test

		 * NEED_RESCHED:

		 */

		smp_mb();

	}



	if (unlikely(need_resched())) {

		current_thread_info()->status |= TS_POLLING;

drivers/acpi/processor_perflib.c

+5 −1
Original line number Diff line number Diff line
@@ -413,7 +413,11 @@ static int acpi_processor_get_performance_info(struct acpi_processor *pr) 
	if (result)

		goto update_bios;



	return 0;

	/* We need to call _PPC once when cpufreq starts */

	if (ignore_ppc != 1)

		result = acpi_processor_get_platform_limit(pr);



	return result;



	/*

	 * Having _PPC but missing frequencies (_PSS, _PCT) is a very good hint that

drivers/platform/x86/acer-wmi.c

+1 −1
Original line number Diff line number Diff line
@@ -934,7 +934,7 @@ static int __devinit acer_backlight_init(struct device *dev) 
	acer_backlight_device = bd;



	bd->props.power = FB_BLANK_UNBLANK;

	bd->props.brightness = max_brightness;

	bd->props.brightness = read_brightness(bd);

	bd->props.max_brightness = max_brightness;

	backlight_update_status(bd);

	return 0;