summaryrefslogtreecommitdiff
path: root/drivers/cpufreq/cpufreq_interactive.c
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@nvidia.com>2011-11-30 17:42:40 -0800
committerDan Willemsen <dwillemsen@nvidia.com>2012-03-23 21:43:36 -0700
commit0f906da15f9889fc7d412c00d495d46dc4f99165 (patch)
tree60d1e3a0e01c300b62318220ca73f1da517061dd /drivers/cpufreq/cpufreq_interactive.c
parent8c0aba795195e4ddd28e6916109b2d18440d996e (diff)
Revert "cpufreq: interactive governor: default 20ms timer"
This reverts commit 4714e5222b5a9b11030eda6df7b8159034be0008. Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com> Rebase-Id: Rc7c804305f9c37c4b93d5d7eecce0b9b93499e27
Diffstat (limited to 'drivers/cpufreq/cpufreq_interactive.c')
-rw-r--r--drivers/cpufreq/cpufreq_interactive.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/cpufreq/cpufreq_interactive.c b/drivers/cpufreq/cpufreq_interactive.c
index 8a5cd15512c7..aafc838166b9 100644
--- a/drivers/cpufreq/cpufreq_interactive.c
+++ b/drivers/cpufreq/cpufreq_interactive.c
@@ -23,7 +23,6 @@
#include <linux/mutex.h>
#include <linux/sched.h>
#include <linux/tick.h>
-#include <linux/time.h>
#include <linux/timer.h>
#include <linux/workqueue.h>
#include <linux/kthread.h>
@@ -70,13 +69,13 @@ static unsigned long go_hispeed_load;
/*
* The minimum amount of time to spend at a frequency before we can ramp down.
*/
-#define DEFAULT_MIN_SAMPLE_TIME 20 * USEC_PER_MSEC
+#define DEFAULT_MIN_SAMPLE_TIME 20000;
static unsigned long min_sample_time;
/*
* The sample rate of the timer used to increase frequency
*/
-#define DEFAULT_TIMER_RATE 20 * USEC_PER_MSEC
+#define DEFAULT_TIMER_RATE 10000;
static unsigned long timer_rate;
static int cpufreq_governor_interactive(struct cpufreq_policy *policy,