[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-d711b8b30c803b1b2aedf6a3474758798078f9e1@git.kernel.org>
Date: Mon, 8 Jun 2015 06:48:34 -0700
From: tip-bot for Borislav Petkov <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: bp@...e.de, linux-kernel@...r.kernel.org, tglx@...utronix.de,
mingo@...nel.org, hpa@...or.com
Subject: [tip:timers/core] hrtimers:
Make sure hrtimer_resolution is unsigned int
Commit-ID: d711b8b30c803b1b2aedf6a3474758798078f9e1
Gitweb: http://git.kernel.org/tip/d711b8b30c803b1b2aedf6a3474758798078f9e1
Author: Borislav Petkov <bp@...e.de>
AuthorDate: Sat, 6 Jun 2015 11:30:00 +0200
Committer: Thomas Gleixner <tglx@...utronix.de>
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 <bp@...e.de>
Link: http://lkml.kernel.org/r/1433583000-32090-1-git-send-email-bp@alien8.de
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Cc: Thomas Gleixner <tglx@...utronix.de>
---
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) { }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists