From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chen Gang Subject: [PATCH v3] kernel/power/hibernate.c: use unsigned variables instead of signed variables in swsusp_show_speed() Date: Fri, 25 Apr 2014 08:44:59 +0800 Message-ID: <5359B00B.6080900@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Sender: linux-kernel-owner@vger.kernel.org To: "Rafael J. Wysocki" , Pavel Machek , Guan Xuetao , len.brown@intel.com Cc: "linux-pm@vger.kernel.org" , "linux-kernel@vger.kernel.org" List-Id: linux-pm@vger.kernel.org do_div() needs 'u64' type, or it reports warning. And negative number is meaningless for "speed", so change all signed to unsigned within swsusp_show_speed(). The related warning (with allmodconfig for unicore32): CC kernel/power/hibernate.o kernel/power/hibernate.c: In function =91swsusp_show_speed=92: kernel/power/hibernate.c:237: warning: comparison of distinct pointer= types lacks a cast Signed-off-by: Chen Gang --- kernel/power/hibernate.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index f4f2073..afc11a0 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -228,19 +228,23 @@ 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; - int centisecs; - int k; - int kps; + u64 elapsed_centisecs64; + unsigned int centisecs; + unsigned int k; + unsigned int kps; =20 elapsed_centisecs64 =3D timeval_to_ns(stop) - timeval_to_ns(start); + /* + * If "(s64)elapsed_centisecs64 < 0", it will print long elapsed time= , + * it is obvious enough for what went wrong. + */ do_div(elapsed_centisecs64, NSEC_PER_SEC / 100); centisecs =3D elapsed_centisecs64; if (centisecs =3D=3D 0) centisecs =3D 1; /* avoid div-by-zero */ k =3D nr_pages * (PAGE_SIZE / 1024); kps =3D (k * 100) / centisecs; - printk(KERN_INFO "PM: %s %d kbytes in %d.%02d seconds (%d.%02d MB/s)\= n", + printk(KERN_INFO "PM: %s %u kbytes in %u.%02u seconds (%u.%02u MB/s)\= n", msg, k, centisecs / 100, centisecs % 100, kps / 1000, (kps % 1000) / 10); --=20 1.9.2.459.g68773ac