diff --git a/[refs] b/[refs] index 4c3fbdc7c2a7..5c836a7f1f73 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd62287e364c0d15d517c6ced4e4808b54711475 +refs/heads/master: e4c2fb0d5776b58049d2556b456144a4db3fe5a9 diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h index a837b20ba190..496770a96487 100644 --- a/trunk/include/linux/sched.h +++ b/trunk/include/linux/sched.h @@ -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)