diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c index e2f7271915d..bddc80f2885 100644 --- a/drivers/cpuidle/governors/menu.c +++ b/drivers/cpuidle/governors/menu.c @@ -125,14 +125,6 @@ struct menu_device { #define LOAD_INT(x) ((x) >> FSHIFT) #define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100) -static int get_loadavg(void) -{ - unsigned long this = this_cpu_load(); - - - return LOAD_INT(this) * 10 + LOAD_FRAC(this) / 10; -} - static inline int which_bucket(unsigned int duration) { int bucket = 0; @@ -170,15 +162,6 @@ static inline int performance_multiplier(void) { int mult = 1; - /* for higher loadavg, we are more reluctant */ - - /* - * this doesn't work as intended - it is almost always 0, but can - * sometimes, depending on workload, spike very high into the hundreds - * even when the average cpu load is under 10%. - */ - /* mult += 2 * get_loadavg(); */ - /* for IO wait tasks (per cpu!) we add 5x each */ mult += 10 * nr_iowait_cpu(smp_processor_id()); diff --git a/scripts/gcc-wrapper.py b/scripts/gcc-wrapper.py index 97c08c035e8..cbe2eae7f43 100755 --- a/scripts/gcc-wrapper.py +++ b/scripts/gcc-wrapper.py @@ -54,7 +54,6 @@ allowed_warnings = set([ "inode.c:72", "inode.c:73", "inode.c:74", - "menu.c:128", "msm_sdcc.c:126", "msm_sdcc.c:128", "nf_conntrack_netlink.c:790",