Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753188AbaDVB33 (ORCPT ); Mon, 21 Apr 2014 21:29:29 -0400 Received: from mail-pb0-f41.google.com ([209.85.160.41]:45824 "EHLO mail-pb0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751138AbaDVB31 (ORCPT ); Mon, 21 Apr 2014 21:29:27 -0400 Message-ID: <5355C5F0.6020606@gmail.com> Date: Tue, 22 Apr 2014 09:29:20 +0800 From: Chen Gang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: "Rafael J. Wysocki" , Pavel Machek , Guan Xuetao , len.brown@intel.com CC: "linux-kernel@vger.kernel.org" , "linux-pm@vger.kernel.org" Subject: [PATCH v2] kernel/power/hibernate.c: use 'u64' instead of 's64' to avoid warning Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Even if 'start' was really bigger than 'stop', it would print incorrect information, but for kernel, it still can continue, so use WARN_ON() is enough. 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 --- kernel/power/hibernate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index f4f2073..d5117d5 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -228,12 +228,13 @@ 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); + WARN_ON((s64)elapsed_centisecs64 < 0); do_div(elapsed_centisecs64, NSEC_PER_SEC / 100); centisecs = elapsed_centisecs64; if (centisecs == 0) -- 1.9.2.459.g68773ac -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/