Merge branches 'release', 'bugzilla-13032', 'bugzilla-13041+', 'bugzilla-13121',...
Len Brown [Sat, 16 May 2009 05:55:59 +0000 (01:55 -0400)]
1  2  3  4  5  6  7  8  9  10  11 
drivers/acpi/processor_idle.c
drivers/acpi/video.c
drivers/gpu/drm/Kconfig

@@@@@@@@@@@@ -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;
@@@@@@@@@@@@ -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;
Simple merge