From: Chen Gang <gang.chen.5i5j@gmail.com>
To: Guan Xuetao <gxt@mprc.pku.edu.cn>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
len.brown@intel.com, pavel@ucw.cz
Cc: "linux-pm@vger.kernel.org" <linux-pm@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH] kernel/power/hibernate.c: be sure of 'start' is not bigger than 'stop'
Date: Mon, 21 Apr 2014 21:40:27 +0800 [thread overview]
Message-ID: <53551FCB.3030109@gmail.com> (raw)
For do_div(), it need 'u64' type, which means the outside must be sure
of 'start' is not bigger than 'stop', or it will report warning.
The related warning (with allmodconfig for unicore32):
CC kernel/power/hibernate.o
kernel/power/hibernate.c: In function ‘swsusp_show_speed’:
kernel/power/hibernate.c:237: warning: comparison of distinct pointer types lacks a cast
Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
---
kernel/power/hibernate.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index f4f2073..0dec9b7 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -228,12 +228,17 @@ static void platform_recover(int platform_mode)
void swsusp_show_speed(struct timeval *start, struct timeval *stop,
unsigned nr_pages, char *msg)
{
- s64 elapsed_centisecs64;
+ u64 elapsed_centisecs64;
int centisecs;
int k;
int kps;
elapsed_centisecs64 = timeval_to_ns(stop) - timeval_to_ns(start);
+ if ((s64)elapsed_centisecs64 < 0) {
+ printk(KERN_ERR "PM: stop: %llu < start %llu\n",
+ timeval_to_ns(stop), timeval_to_ns(start));
+ return;
+ }
do_div(elapsed_centisecs64, NSEC_PER_SEC / 100);
centisecs = elapsed_centisecs64;
if (centisecs == 0)
--
1.9.2.459.g68773ac
next reply other threads:[~2014-04-21 13:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-21 13:40 Chen Gang [this message]
2014-04-21 20:09 ` [PATCH] kernel/power/hibernate.c: be sure of 'start' is not bigger than 'stop' Pavel Machek
2014-04-21 20:43 ` Rafael J. Wysocki
2014-04-22 0:58 ` Chen Gang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53551FCB.3030109@gmail.com \
--to=gang.chen.5i5j@gmail.com \
--cc=gxt@mprc.pku.edu.cn \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=rjw@rjwysocki.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).