Merge tag 'pm+acpi-3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI and power management fixes from Rafael Wysocki: - Revert two cpuidle commits added during the 3.8 development cycle that turn out to have introduced a significant performance regression as requested by Jeremy Eder. - The recent patches that made the freezer less heavy-weight introduced a regression causing user-space-driven hibernation using the ioctl() interface to block indefinitely when the hibernate process executes try_to_freeze(). Fix from Colin Cross addresses this by adding a process flag to mark the hibernate/suspend process to inform the freezer that that process should be ignored. - One of the recent cpufreq reverts uncovered a problem in the core causing the cpufreq driver module refcount to become negative after a system suspend-resume cycle. Fix from Rafael J Wysocki. - The evaluation of the ACPI battery _BIX method has never worked correctly, because the commit that added support for it forgot to take the "Revision" field in the return package into account. As a result, the reading of battery info doesn't work at all on some systems, which is addressed by a fix from Lan Tianyu. * tag 'pm+acpi-3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: freezer: set PF_SUSPEND_TASK flag on tasks that call freeze_processes ACPI / battery: Fix parsing _BIX return value cpufreq: Fix cpufreq driver module refcount balance after suspend/resume Revert "cpuidle: Quickly notice prediction failure for repeat mode" Revert "cpuidle: Quickly notice prediction failure in general case"
No related branches found
No related tags found
Showing
- drivers/acpi/battery.c 2 additions, 0 deletionsdrivers/acpi/battery.c
- drivers/cpufreq/cpufreq.c 10 additions, 9 deletionsdrivers/cpufreq/cpufreq.c
- drivers/cpuidle/governors/menu.c 4 additions, 102 deletionsdrivers/cpuidle/governors/menu.c
- include/linux/sched.h 1 addition, 0 deletionsinclude/linux/sched.h
- include/linux/tick.h 0 additions, 6 deletionsinclude/linux/tick.h
- kernel/freezer.c 1 addition, 1 deletionkernel/freezer.c
- kernel/power/process.c 11 additions, 0 deletionskernel/power/process.c
- kernel/time/tick-sched.c 2 additions, 7 deletionskernel/time/tick-sched.c
Loading
Please register or sign in to comment