|
@@ -18,6 +18,7 @@
|
|
|
#include <linux/hrtimer.h>
|
|
|
#include <linux/tick.h>
|
|
|
#include <linux/sched.h>
|
|
|
+#include <linux/math64.h>
|
|
|
|
|
|
#define BUCKETS 12
|
|
|
#define RESOLUTION 1024
|
|
@@ -169,6 +170,12 @@ static DEFINE_PER_CPU(struct menu_device, menu_devices);
|
|
|
|
|
|
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
|
|
|
* @dev: the CPU
|
|
@@ -209,9 +216,8 @@ static int menu_select(struct cpuidle_device *dev)
|
|
|
data->correction_factor[data->bucket] = RESOLUTION * DECAY;
|
|
|
|
|
|
/* Make sure to round up for half microseconds */
|
|
|
- data->predicted_us = DIV_ROUND_CLOSEST(
|
|
|
- data->expected_us * data->correction_factor[data->bucket],
|
|
|
- RESOLUTION * DECAY);
|
|
|
+ data->predicted_us = div_round64(data->expected_us * data->correction_factor[data->bucket],
|
|
|
+ RESOLUTION * DECAY);
|
|
|
|
|
|
/*
|
|
|
* We want to default to C1 (hlt), not to busy polling
|