Skip to content

Commit

Permalink
[PATCH] i386: Make the jiffies compares use the 64bit safe macros.
Browse files Browse the repository at this point in the history
Signed-off-by: Dmitriy Zavin <dmitriyz@google.com>
Signed-off-by: Andi Kleen <ak@suse.de>
  • Loading branch information
Dmitriy Zavin authored and Andi Kleen committed Sep 26, 2006
1 parent 15d5f83 commit 66aea99
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions arch/i386/kernel/cpu/mcheck/therm_throt.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
/* How long to wait between reporting thermal events */
#define CHECK_INTERVAL (300 * HZ)

static DEFINE_PER_CPU(unsigned long, next_check);
static DEFINE_PER_CPU(__u64, next_check);

/***
* therm_throt_process - Process thermal throttling event
Expand All @@ -39,11 +39,12 @@ static DEFINE_PER_CPU(unsigned long, next_check);
int therm_throt_process(int curr)
{
unsigned int cpu = smp_processor_id();
__u64 tmp_jiffs = get_jiffies_64();

if (time_before(jiffies, __get_cpu_var(next_check)))
if (time_before64(tmp_jiffs, __get_cpu_var(next_check)))
return 0;

__get_cpu_var(next_check) = jiffies + CHECK_INTERVAL;
__get_cpu_var(next_check) = tmp_jiffs + CHECK_INTERVAL;

/* if we just entered the thermal event */
if (curr) {
Expand Down

0 comments on commit 66aea99

Please sign in to comment.