Commit 66aea991 authored by Dmitriy Zavin's avatar Dmitriy Zavin Committed by Andi Kleen

[PATCH] i386: Make the jiffies compares use the 64bit safe macros.

Signed-off-by: default avatarDmitriy Zavin <dmitriyz@google.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 15d5f839
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
/* How long to wait between reporting thermal events */ /* How long to wait between reporting thermal events */
#define CHECK_INTERVAL (300 * HZ) #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 * therm_throt_process - Process thermal throttling event
...@@ -39,11 +39,12 @@ static DEFINE_PER_CPU(unsigned long, next_check); ...@@ -39,11 +39,12 @@ static DEFINE_PER_CPU(unsigned long, next_check);
int therm_throt_process(int curr) int therm_throt_process(int curr)
{ {
unsigned int cpu = smp_processor_id(); 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; 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 we just entered the thermal event */
if (curr) { if (curr) {
......
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