The patch titled
clocksource-pass-clocksource-to-read-callback fix
has been added to the -mm tree. Its filename is
clocksource-pass-clocksource-to-read-callback-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: clocksource-pass-clocksource-to-read-callback fix
From: Magnus Damm <magnus.damm@xxxxxxxxx>
post-conflict fixup
Cc: Paul Mundt <lethal@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/sh/kernel/time_32.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN arch/sh/kernel/time_32.c~clocksource-pass-clocksource-to-read-callback-fix arch/sh/kernel/time_32.c
--- a/arch/sh/kernel/time_32.c~clocksource-pass-clocksource-to-read-callback-fix
+++ a/arch/sh/kernel/time_32.c
@@ -208,7 +208,7 @@ unsigned long long sched_clock(void)
if (!clocksource_sh.rating)
return (unsigned long long)jiffies * (NSEC_PER_SEC / HZ);
- cycles = clocksource_sh.read();
+ cycles = clocksource_sh.read(&clocksource_sh);
return cyc2ns(&clocksource_sh, cycles);
}
#endif
_
Patches currently in -mm which might be from magnus.damm@xxxxxxxxx are
linux-next.patch
clocksource-pass-clocksource-to-read-callback-fix.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
