The patch titled
hrtimers: fix accidental implicit cast in HR-timer conversion
has been removed from the -mm tree. Its filename was
fix-accidental-implicit-cast-in-hr-timer-conversion.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: hrtimers: fix accidental implicit cast in HR-timer conversion
From: David Howells <dhowells@xxxxxxxxxx>
Fix the hrtimer_add_expires_ns() function. It should take a 'u64 ns'
argument, but rather takes an 'unsigned long ns' argument - which might
only be 32-bits.
On FRV, this results in the kernel locking up because hrtimer_forward()
passes the result of a 64-bit multiplication to this function, for which
the compiler discards the top 32-bits - something that didn't happen when
ktime_add_ns() was called directly.
Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
Acked-by: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/hrtimer.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN include/linux/hrtimer.h~fix-accidental-implicit-cast-in-hr-timer-conversion include/linux/hrtimer.h
--- a/include/linux/hrtimer.h~fix-accidental-implicit-cast-in-hr-timer-conversion
+++ a/include/linux/hrtimer.h
@@ -239,7 +239,7 @@ static inline void hrtimer_add_expires(s
timer->_softexpires = ktime_add_safe(timer->_softexpires, time);
}
-static inline void hrtimer_add_expires_ns(struct hrtimer *timer, unsigned long ns)
+static inline void hrtimer_add_expires_ns(struct hrtimer *timer, u64 ns)
{
timer->_expires = ktime_add_ns(timer->_expires, ns);
timer->_softexpires = ktime_add_ns(timer->_softexpires, ns);
_
Patches currently in -mm which might be from dhowells@xxxxxxxxxx are
linux-next.patch
frv-use-the-new-byteorder-headers.patch
mutex-subsystem-synchro-test-module.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
