[tip:timers/core] hrtimers: Make sure hrtimer_resolution is unsigned int

From: tip-bot for Borislav Petkov
Date: Mon Jun 08 2015 - 09:48:59 EST


Commit-ID: d711b8b30c803b1b2aedf6a3474758798078f9e1
Gitweb: http://git.kernel.org/tip/d711b8b30c803b1b2aedf6a3474758798078f9e1
Author: Borislav Petkov <bp@xxxxxxx>
AuthorDate: Sat, 6 Jun 2015 11:30:00 +0200
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
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@xxxxxxx>
Link: http://lkml.kernel.org/r/1433583000-32090-1-git-send-email-bp@xxxxxxxxx
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
---
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@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/