tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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 be64c970 34e3f91b

+22 -14
+16 -12
drivers/acpi/processor_idle.c
··· 880 880 return(acpi_idle_enter_c1(dev, state)); 881 881 882 882 local_irq_disable(); 883 - current_thread_info()->status &= ~TS_POLLING; 884 - /* 885 - * TS_POLLING-cleared state must be visible before we test 886 - * NEED_RESCHED: 887 - */ 888 - smp_mb(); 883 + if (cx->entry_method != ACPI_CSTATE_FFH) { 884 + current_thread_info()->status &= ~TS_POLLING; 885 + /* 886 + * TS_POLLING-cleared state must be visible before we test 887 + * NEED_RESCHED: 888 + */ 889 + smp_mb(); 890 + } 889 891 890 892 if (unlikely(need_resched())) { 891 893 current_thread_info()->status |= TS_POLLING; ··· 967 965 } 968 966 969 967 local_irq_disable(); 970 - current_thread_info()->status &= ~TS_POLLING; 971 - /* 972 - * TS_POLLING-cleared state must be visible before we test 973 - * NEED_RESCHED: 974 - */ 975 - smp_mb(); 968 + if (cx->entry_method != ACPI_CSTATE_FFH) { 969 + current_thread_info()->status &= ~TS_POLLING; 970 + /* 971 + * TS_POLLING-cleared state must be visible before we test 972 + * NEED_RESCHED: 973 + */ 974 + smp_mb(); 975 + } 976 976 977 977 if (unlikely(need_resched())) { 978 978 current_thread_info()->status |= TS_POLLING;
+5 -1
drivers/acpi/processor_perflib.c
··· 413 413 if (result) 414 414 goto update_bios; 415 415 416 - return 0; 416 + /* We need to call _PPC once when cpufreq starts */ 417 + if (ignore_ppc != 1) 418 + result = acpi_processor_get_platform_limit(pr); 419 + 420 + return result; 417 421 418 422 /* 419 423 * Having _PPC but missing frequencies (_PSS, _PCT) is a very good hint that
+1 -1
drivers/platform/x86/acer-wmi.c
··· 934 934 acer_backlight_device = bd; 935 935 936 936 bd->props.power = FB_BLANK_UNBLANK; 937 - bd->props.brightness = max_brightness; 937 + bd->props.brightness = read_brightness(bd); 938 938 bd->props.max_brightness = max_brightness; 939 939 backlight_update_status(bd); 940 940 return 0;