Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[sfrench/cifs-2.6.git] / drivers / cpuidle / governors / menu.c

diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
index daf850250b6aa069ccba0f93819dad637fdd952d..ae5a42595e1c620b8a6f1c54e83cc57098219563 100644 (file)
--- a/drivers/cpuidle/governors/menu.c
+++ b/drivers/cpuidle/governors/menu.c
@@ -35,7 +35,6 @@
 #define RESOLUTION 1024
 #define DECAY 8
 #define MAX_INTERESTING 50000
 #define RESOLUTION 1024
 #define DECAY 8
 #define MAX_INTERESTING 50000

-#define STDDEV_THRESH 400

 
 
 /*
 
 
 /*


@@ -296,7 +295,7 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev)
                data->needs_update = 0;
        }
 
                data->needs_update = 0;
        }
 

-       data->last_state_idx = 0;
+       data->last_state_idx = CPUIDLE_DRIVER_STATE_START - 1;

 
        /* Special case when user has set very strict latency requirement */
        if (unlikely(latency_req == 0))
 
        /* Special case when user has set very strict latency requirement */
        if (unlikely(latency_req == 0))


@@ -310,13 +309,6 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev)
 
        data->bucket = which_bucket(data->next_timer_us);
 
 
        data->bucket = which_bucket(data->next_timer_us);
 

-       /*
-        * if the correction factor is 0 (eg first time init or cpu hotplug
-        * etc), we actually want to start out with a unity factor.
-        */
-       if (data->correction_factor[data->bucket] == 0)
-               data->correction_factor[data->bucket] = RESOLUTION * DECAY;
-

        /*
         * Force the result of multiplication to be 64 bits even if both
         * operands are 32 bits.
        /*
         * Force the result of multiplication to be 64 bits even if both
         * operands are 32 bits.


@@ -466,9 +458,17 @@ static int menu_enable_device(struct cpuidle_driver *drv,
                                struct cpuidle_device *dev)
 {
        struct menu_device *data = &per_cpu(menu_devices, dev->cpu);
                                struct cpuidle_device *dev)
 {
        struct menu_device *data = &per_cpu(menu_devices, dev->cpu);

+       int i;

 
        memset(data, 0, sizeof(struct menu_device));
 
 
        memset(data, 0, sizeof(struct menu_device));
 

+       /*
+        * if the correction factor is 0 (eg first time init or cpu hotplug
+        * etc), we actually want to start out with a unity factor.
+        */
+       for(i = 0; i < BUCKETS; i++)
+               data->correction_factor[i] = RESOLUTION * DECAY;
+

        return 0;
 }
 
        return 0;
 }