Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / kernel / power / process.c

diff --git a/kernel/power/process.c b/kernel/power/process.c
index 5fb8765..278946a 100644 (file)
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -149,7 +149,7 @@ static int try_to_freeze_tasks(bool sig_only)
        unsigned long end_time;
        unsigned int todo;
        struct timeval start, end;
-       s64 elapsed_csecs64;
+       u64 elapsed_csecs64;
        unsigned int elapsed_csecs;
 
        do_gettimeofday(&start);