From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 21 Nov 2014 15:31:42 +0000 (+0100)
Subject: Merge back earlier cpuidle material for 3.19-rc1.
X-Git-Tag: v3.19-rc1~129^2~2^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=0a924200ae5fcf7b3d237d92a110545b6db6aa18;p=linux.git

Merge back earlier cpuidle material for 3.19-rc1.

Conflicts:
	drivers/cpuidle/dt_idle_states.c
---

0a924200ae5fcf7b3d237d92a110545b6db6aa18
diff --cc drivers/cpuidle/dt_idle_states.c
index 5301912cb84e,6e6f0b272835..a5c111b67f37
--- a/drivers/cpuidle/dt_idle_states.c
+++ b/drivers/cpuidle/dt_idle_states.c
@@@ -74,11 -73,7 +74,11 @@@ static int init_state_node(struct cpuid
  		return -EINVAL;
  	}
  
 +	err = of_property_read_string(state_node, "idle-state-name", &desc);
 +	if (err)
 +		desc = state_node->name;
 +
- 	idle_state->flags = CPUIDLE_FLAG_TIME_VALID;
+ 	idle_state->flags = 0;
  	if (of_property_read_bool(state_node, "local-timer-stop"))
  		idle_state->flags |= CPUIDLE_FLAG_TIMER_STOP;
  	/*