diff --git a/[refs] b/[refs] index 5f8a25bc783a..ee2281dcfdf3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e41fb7c58e3ca18ec5c9c9bb7bb68e8e653c9e8e +refs/heads/master: f0af566da6e9a4a2f5a83c5a70f3d0a772050e21 diff --git a/trunk/kernel/power/process.c b/trunk/kernel/power/process.c index 5fb87652f214..278946aecaf0 100644 --- a/trunk/kernel/power/process.c +++ b/trunk/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);