From: Len Brown <len.brown@intel.com>
Date: Sat, 16 May 2009 05:55:59 +0000 (-0400)
Subject: Merge branches 'release', 'bugzilla-13032', 'bugzilla-13041+', 'bugzilla-13121',... 
X-Git-Tag: v5.15~33848^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4e3507f7189111b0cb66c30def3423c6aba8f85a;p=mirror_ubuntu-kernels.git

Merge branches 'release', 'bugzilla-13032', 'bugzilla-13041+', 'bugzilla-13121', 'bugzilla-13165', 'bugzilla-13243', 'bugzilla-13259', 'resume-sci-en-regression', 'thermal-regression', 'tsc-regression' and 'asus-2.6.30' into release
---

4e3507f7189111b0cb66c30def3423c6aba8f85a
diff --cc drivers/acpi/processor_idle.c
index f7ca8c55956b,c1d59cfdb5fb,f7ca8c55956b,6fe121434ffb,6fe121434ffb,f7ca8c55956b,f7ca8c55956b,f7ca8c55956b,f7ca8c55956b,e65476fdf40d,f7ca8c55956b..72069ba5f1ed
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@@@@@@@@@@@ -578,14 -601,14 -578,14 -578,9 -578,9 -578,14 -578,14 -578,14 -578,14 -582,9 -578,14 +605,9 @@@@@@@@@@@@ static int acpi_processor_power_verify(
           
           	pr->power.timer_broadcast_on_state = INT_MAX;
           
--------- -	for (i = 1; i < ACPI_PROCESSOR_MAX_POWER; i++) {
+++++++++ +	for (i = 1; i < ACPI_PROCESSOR_MAX_POWER && i <= max_cstate; i++) {
           		struct acpi_processor_cx *cx = &pr->power.states[i];
           
---  ---- -#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86)
---  ---- -		/* TSC could halt in idle, so notify users */
---  ---- -		if (tsc_halts_in_c(cx->type))
---  ---- -			mark_tsc_unstable("TSC halts in idle");;
---  ---- -#endif
           		switch (cx->type) {
           		case ACPI_STATE_C1:
           			cx->valid = 1;
diff --cc drivers/acpi/video.c
index d7ff61c0d571,d7ff61c0d571,d7ff61c0d571,3a3d1565a7dd,cd4fb7543a90,d7ff61c0d571,d7ff61c0d571,d7ff61c0d571,d7ff61c0d571,d7ff61c0d571,d7ff61c0d571..810cca90ca7f
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@@@@@@@@@@@ -770,12 -770,12 -770,12 -806,10 -770,10 -770,12 -770,12 -770,12 -770,12 -770,12 -770,12 +806,12 @@@@@@@@@@@@ acpi_video_init_brightness(struct acpi_
           	 * In this case, the first two elements in _BCL packages
           	 * are also supported brightness levels that OS should take care of.
           	 */
   --      	for (i = 2; i < count; i++)
   --      		if (br->levels[i] == br->levels[0] ||
   --      		    br->levels[i] == br->levels[1])
   ++      	for (i = 2; i < count; i++) {
   ++      		if (br->levels[i] == br->levels[0])
    +      			level_ac_battery++;
   ++      		if (br->levels[i] == br->levels[1])
   +       			level_ac_battery++;
   ++      	}
           
           	if (level_ac_battery < 2) {
           		level_ac_battery = 2 - level_ac_battery;