Commit 5787536e authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Linus Torvalds

drivers/cpuidle/governors/menu.c: fix undefined reference to `__udivdi3'

menu: use proper 64 bit math

The new menu governor is incorrectly doing a 64 bit divide.  Compile
tested only
Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 006b4298
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <linux/hrtimer.h> #include <linux/hrtimer.h>
#include <linux/tick.h> #include <linux/tick.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/math64.h>
#define BUCKETS 12 #define BUCKETS 12
#define RESOLUTION 1024 #define RESOLUTION 1024
...@@ -169,6 +170,12 @@ static DEFINE_PER_CPU(struct menu_device, menu_devices); ...@@ -169,6 +170,12 @@ static DEFINE_PER_CPU(struct menu_device, menu_devices);
static void menu_update(struct cpuidle_device *dev); static void menu_update(struct cpuidle_device *dev);
/* This implements DIV_ROUND_CLOSEST but avoids 64 bit division */
static u64 div_round64(u64 dividend, u32 divisor)
{
return div_u64(dividend + (divisor / 2), divisor);
}
/** /**
* menu_select - selects the next idle state to enter * menu_select - selects the next idle state to enter
* @dev: the CPU * @dev: the CPU
...@@ -209,8 +216,7 @@ static int menu_select(struct cpuidle_device *dev) ...@@ -209,8 +216,7 @@ static int menu_select(struct cpuidle_device *dev)
data->correction_factor[data->bucket] = RESOLUTION * DECAY; data->correction_factor[data->bucket] = RESOLUTION * DECAY;
/* Make sure to round up for half microseconds */ /* Make sure to round up for half microseconds */
data->predicted_us = DIV_ROUND_CLOSEST( data->predicted_us = div_round64(data->expected_us * data->correction_factor[data->bucket],
data->expected_us * data->correction_factor[data->bucket],
RESOLUTION * DECAY); RESOLUTION * DECAY);
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment