From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932810AbbFHNsz (ORCPT ); Mon, 8 Jun 2015 09:48:55 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38870 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753424AbbFHNst (ORCPT ); Mon, 8 Jun 2015 09:48:49 -0400 Date: Mon, 8 Jun 2015 06:48:34 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: bp@suse.de, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com Reply-To: mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, bp@suse.de, hpa@zytor.com In-Reply-To: <1433583000-32090-1-git-send-email-bp@alien8.de> References: <1433583000-32090-1-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] hrtimers: Make sure hrtimer_resolution is unsigned int Git-Commit-ID: d711b8b30c803b1b2aedf6a3474758798078f9e1 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: d711b8b30c803b1b2aedf6a3474758798078f9e1 Gitweb: http://git.kernel.org/tip/d711b8b30c803b1b2aedf6a3474758798078f9e1 Author: Borislav Petkov AuthorDate: Sat, 6 Jun 2015 11:30:00 +0200 Committer: Thomas Gleixner CommitDate: Mon, 8 Jun 2015 15:46:06 +0200 hrtimers: Make sure hrtimer_resolution is unsigned int ... in the !CONFIG_HIGH_RES_TIMERS case too. And thus fix warnings like this one: net/sched/sch_api.c: In function ‘psched_show’: net/sched/sch_api.c:1891:6: warning: format ‘%x’ expects argument of type ‘unsigned int’, but argument 6 has type ‘long int’ [-Wformat=] (u32)NSEC_PER_SEC / hrtimer_resolution); Signed-off-by: Borislav Petkov Link: http://lkml.kernel.org/r/1433583000-32090-1-git-send-email-bp@alien8.de Signed-off-by: Thomas Gleixner Cc: Thomas Gleixner --- include/linux/hrtimer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index 470d876..3f82a7e 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h @@ -309,7 +309,7 @@ extern unsigned int hrtimer_resolution; # define MONOTONIC_RES_NSEC LOW_RES_NSEC # define KTIME_MONOTONIC_RES KTIME_LOW_RES -#define hrtimer_resolution LOW_RES_NSEC +#define hrtimer_resolution (unsigned int)LOW_RES_NSEC static inline void hrtimer_peek_ahead_timers(void) { }