From 8dca6f33f026dc8a7fc2710b78a7521e899bd611 Mon Sep 17 00:00:00 2001 From: Jonathan Corbet Date: Mon, 16 Jan 2006 15:58:55 -0700 Subject: [PATCH] hrtimer comment tweak Fix a comment which missed an update cycle somewhere. Signed-off-by: Jonathan Corbet Signed-off-by: Linus Torvalds --- kernel/hrtimer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kernel/hrtimer.c') diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 04ccab099e84..f5ca61422331 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -272,7 +272,7 @@ void unlock_hrtimer_base(const struct hrtimer *timer, unsigned long *flags) * @interval: the interval to forward * * Forward the timer expiry so it will expire in the future. - * The number of overruns is added to the overrun field. + * Returns the number of overruns. */ unsigned long hrtimer_forward(struct hrtimer *timer, ktime_t interval) -- cgit v1.2.3 From ea13dbc89caecd982500894d4238766a6bd3c8f4 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Mon, 16 Jan 2006 10:59:41 +0100 Subject: [PATCH] kernel/hrtimer.c sparse warning fix fix the following sparse warning: kernel/hrtimer.c:665:34: warning: incorrect type in argument 2 (different address spaces) kernel/hrtimer.c:665:34: expected void const *from kernel/hrtimer.c:665:34: got struct timespec [noderef] * kernel/hrtimer.c:664:2: warning: dereference of noderef expression Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds --- kernel/hrtimer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'kernel/hrtimer.c') diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index f5ca61422331..f1c4155b49ac 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -641,7 +641,8 @@ schedule_hrtimer_interruptible(struct hrtimer *timer, static long __sched nanosleep_restart(struct restart_block *restart, clockid_t clockid) { - struct timespec __user *rmtp, tu; + struct timespec __user *rmtp; + struct timespec tu; void *rfn_save = restart->fn; struct hrtimer timer; ktime_t rem; -- cgit v1.2.3