diff options
author | Dmitriy Zavin <dmitriyz@google.com> | 2006-09-26 04:52:42 -0400 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2006-09-26 04:52:42 -0400 |
commit | 66aea9913cf435fe92ebb7bf869b4f15901ab993 (patch) | |
tree | 2c64fb8515ee354fea964942cb2f935266501e8c /arch | |
parent | 15d5f8398311f565682959daaca30e3ca7aea600 (diff) |
[PATCH] i386: Make the jiffies compares use the 64bit safe macros.
Signed-off-by: Dmitriy Zavin <dmitriyz@google.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/i386/kernel/cpu/mcheck/therm_throt.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/i386/kernel/cpu/mcheck/therm_throt.c b/arch/i386/kernel/cpu/mcheck/therm_throt.c index 85eba00d680e..101f7ace00ce 100644 --- a/arch/i386/kernel/cpu/mcheck/therm_throt.c +++ b/arch/i386/kernel/cpu/mcheck/therm_throt.c | |||
@@ -18,7 +18,7 @@ | |||
18 | /* How long to wait between reporting thermal events */ | 18 | /* How long to wait between reporting thermal events */ |
19 | #define CHECK_INTERVAL (300 * HZ) | 19 | #define CHECK_INTERVAL (300 * HZ) |
20 | 20 | ||
21 | static DEFINE_PER_CPU(unsigned long, next_check); | 21 | static DEFINE_PER_CPU(__u64, next_check); |
22 | 22 | ||
23 | /*** | 23 | /*** |
24 | * therm_throt_process - Process thermal throttling event | 24 | * therm_throt_process - Process thermal throttling event |
@@ -39,11 +39,12 @@ static DEFINE_PER_CPU(unsigned long, next_check); | |||
39 | int therm_throt_process(int curr) | 39 | int therm_throt_process(int curr) |
40 | { | 40 | { |
41 | unsigned int cpu = smp_processor_id(); | 41 | unsigned int cpu = smp_processor_id(); |
42 | __u64 tmp_jiffs = get_jiffies_64(); | ||
42 | 43 | ||
43 | if (time_before(jiffies, __get_cpu_var(next_check))) | 44 | if (time_before64(tmp_jiffs, __get_cpu_var(next_check))) |
44 | return 0; | 45 | return 0; |
45 | 46 | ||
46 | __get_cpu_var(next_check) = jiffies + CHECK_INTERVAL; | 47 | __get_cpu_var(next_check) = tmp_jiffs + CHECK_INTERVAL; |
47 | 48 | ||
48 | /* if we just entered the thermal event */ | 49 | /* if we just entered the thermal event */ |
49 | if (curr) { | 50 | if (curr) { |