Merge commit 'v3.0-rc7' into android-3.0

This commit is contained in:
Colin Cross
2011-07-12 20:10:37 -07:00
220 changed files with 2227 additions and 1453 deletions

View File

@@ -808,7 +808,7 @@ enum cpu_idle_type {
* when BITS_PER_LONG <= 32 are pretty high and the returns do not justify the
* increased costs.
*/
#if BITS_PER_LONG > 32
#if 0 /* BITS_PER_LONG > 32 -- currently broken: it increases power usage under light load */
# define SCHED_LOAD_RESOLUTION 10
# define scale_load(w) ((w) << SCHED_LOAD_RESOLUTION)
# define scale_load_down(w) ((w) >> SCHED_LOAD_RESOLUTION)