diff options
author | David Howells <dhowells@redhat.com> | 2008-07-24 00:28:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 13:47:24 -0400 |
commit | f0af566da6e9a4a2f5a83c5a70f3d0a772050e21 (patch) | |
tree | 4f7a4819abfde03938bb95c525ed652bcfe40a52 /kernel | |
parent | e41fb7c58e3ca18ec5c9c9bb7bb68e8e653c9e8e (diff) |
pm: fix try_to_freeze_tasks()'s use of do_div()
Fix try_to_freeze_tasks()'s use of do_div() on an s64 by making
elapsed_csecs64 a u64 instead and dividing that.
Possibly this should be guarded lest the interval calculation turn up
negative, but the possible negativity of the result of the division is
cast away anyway.
This was introduced by patch 438e2ce68dfd4af4cfcec2f873564fb921db4bb5.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: "Rafael J. Wysocki" <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/power/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/process.c b/kernel/power/process.c index 5fb87652f21..278946aecaf 100644 --- a/kernel/power/process.c +++ b/kernel/power/process.c | |||
@@ -149,7 +149,7 @@ static int try_to_freeze_tasks(bool sig_only) | |||
149 | unsigned long end_time; | 149 | unsigned long end_time; |
150 | unsigned int todo; | 150 | unsigned int todo; |
151 | struct timeval start, end; | 151 | struct timeval start, end; |
152 | s64 elapsed_csecs64; | 152 | u64 elapsed_csecs64; |
153 | unsigned int elapsed_csecs; | 153 | unsigned int elapsed_csecs; |
154 | 154 | ||
155 | do_gettimeofday(&start); | 155 | do_gettimeofday(&start); |