Skip to content

Commit

Permalink
Merge branch 'cpuidle/3.20' of http://git.linaro.org/people/daniel.le…
Browse files Browse the repository at this point in the history
…zcano/linux into pm-cpuidle

Pull ARM cpuidle update for 3.20 from Daniel Lezcano.

* 'cpuidle/3.20' of http://git.linaro.org/people/daniel.lezcano/linux:
  drivers: cpuidle: Don't initialize big.LITTLE driver if MCPM is unavailable
  • Loading branch information
Rafael J. Wysocki committed Jan 26, 2015
2 parents ec6f34e + 194fe6f commit 39909b7
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/cpuidle/cpuidle-big_little.c
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,10 @@ static int __init bl_idle_init(void)
*/
if (!of_match_node(compatible_machine_match, root))
return -ENODEV;

if (!mcpm_is_available())
return -EUNATCH;

/*
* For now the differentiation between little and big cores
* is based on the part number. A7 cores are considered little
Expand Down

0 comments on commit 39909b7

Please sign in to comment.