Skip to content

Commit

Permalink
drivers/cpuidle/governors/menu.c: fix undefined reference to `__udivdi3'
Browse files Browse the repository at this point in the history
menu: use proper 64 bit math

The new menu governor is incorrectly doing a 64 bit divide.  Compile
tested only

Signed-off-by: Stephen 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Stephen Hemminger authored and Linus Torvalds committed Jan 11, 2010
1 parent 006b429 commit 5787536
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions drivers/cpuidle/governors/menu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 5787536

Please sign in to comment.