From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 29 Dec 2014 20:23:41 +0000 (+0100)
Subject: Merge branches 'pm-cpufreq' and 'pm-cpuidle'
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ff23ab2441e7ba5089e8631bad3a6569e7b6d5b8;p=openwrt%2Fstaging%2Fblogic.git

Merge branches 'pm-cpufreq' and 'pm-cpuidle'

* pm-cpufreq:
  cpufreq: fix a NULL pointer dereference in __cpufreq_governor()
  cpufreq-dt: defer probing if OPP table is not ready

* pm-cpuidle:
  cpuidle / ACPI: remove unused CPUIDLE_FLAG_TIME_INVALID
  cpuidle: ladder: Better idle duration measurement without using CPUIDLE_FLAG_TIME_INVALID
  cpuidle: menu: Better idle duration measurement without using CPUIDLE_FLAG_TIME_INVALID
---

ff23ab2441e7ba5089e8631bad3a6569e7b6d5b8
diff --cc drivers/acpi/processor_idle.c
index 499536504698,17f9ec501972,7afba40e350e..87b704e41877
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@@@ -985,8 -985,8 -985,6 +985,6 @@@@ static int acpi_processor_setup_cpuidle
   		state->flags = 0;
   		switch (cx->type) {
   			case ACPI_STATE_C1:
-  			if (cx->entry_method != ACPI_CSTATE_FFH)
-  				state->flags |= CPUIDLE_FLAG_TIME_INVALID;
 - 			if (cx->entry_method == ACPI_CSTATE_FFH)
 - 				state->flags |= CPUIDLE_FLAG_TIME_VALID;
   
   			state->enter = acpi_idle_enter_c1;
   			state->enter_dead = acpi_idle_play_dead;