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

Linus Torvalds committed 16 years ago

Commit be64c972 parents 34e3f91 b2cb9dc3 files · +22 −14Browse files

Unified · Split

3 files

drivers/acpi/processor_idle.c +16 −12
drivers/acpi/processor_perflib.c +5 −1
drivers/platform/x86/acer-wmi.c +1 −1

drivers/acpi/processor_idle.c+16−12

@@ -880,12 +880,14 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev, · 879 unmodified lines
880	return(acpi_idle_enter_c1(dev, state));	880	return(acpi_idle_enter_c1(dev, state));
881		881
882	local_irq_disable();	882	local_irq_disable();
883	current_thread_info()->status &= ~TS_POLLING;	883	if (cx->entry_method != ACPI_CSTATE_FFH) {
884	/*	884	current_thread_info()->status &= ~TS_POLLING;
885	* TS_POLLING-cleared state must be visible before we test	885	/*
886	* NEED_RESCHED:	886	* TS_POLLING-cleared state must be visible before we test
887	*/	887	* NEED_RESCHED:
888	smp_mb();	888	*/
		889	smp_mb();
		890	}
889		891
890	if (unlikely(need_resched())) {	892	if (unlikely(need_resched())) {
891	current_thread_info()->status \|= TS_POLLING;	893	current_thread_info()->status \|= TS_POLLING;
@@ -965,12 +967,14 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev, · 73 unmodified lines
965	}	967	}
966		968
967	local_irq_disable();	969	local_irq_disable();
968	current_thread_info()->status &= ~TS_POLLING;	970	if (cx->entry_method != ACPI_CSTATE_FFH) {
969	/*	971	current_thread_info()->status &= ~TS_POLLING;
970	* TS_POLLING-cleared state must be visible before we test	972	/*
971	* NEED_RESCHED:	973	* TS_POLLING-cleared state must be visible before we test
972	*/	974	* NEED_RESCHED:
973	smp_mb();	975	*/
		976	smp_mb();
		977	}
974		978
975	if (unlikely(need_resched())) {	979	if (unlikely(need_resched())) {
976	current_thread_info()->status \|= TS_POLLING;	980	current_thread_info()->status \|= TS_POLLING;

drivers/acpi/processor_perflib.c+5−1

 	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

@@ -934,7 +934,7 @@ static int __devinit acer_backlight_init(struct device *dev) · 933 unmodified lines
934	acer_backlight_device = bd;	934	acer_backlight_device = bd;
935		935
936	bd->props.power = FB_BLANK_UNBLANK;	936	bd->props.power = FB_BLANK_UNBLANK;
937	bd->props.brightness = max_brightness;	937	bd->props.brightness = read_brightness(bd);
938	bd->props.max_brightness = max_brightness;	938	bd->props.max_brightness = max_brightness;
939	backlight_update_status(bd);	939	backlight_update_status(bd);
940	return 0;	940	return 0;

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

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code