The patch titled
s390: fix do_gettimeoffset
has been added to the -mm tree. Its filename is
kill-wall_jiffies-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: s390: fix do_gettimeoffset
From: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
kill-wall_jiffies.patch breaks s390's do_gettimeoffset(). Fix this and do a
small whitespace cleanup while we are at it.
Cc: Atsushi Nemoto <anemo@xxxxxxxxxxxxx>
Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/s390/kernel/time.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
diff -puN arch/s390/kernel/time.c~kill-wall_jiffies-fix arch/s390/kernel/time.c
--- a/arch/s390/kernel/time.c~kill-wall_jiffies-fix
+++ a/arch/s390/kernel/time.c
@@ -85,7 +85,8 @@ static inline unsigned long do_gettimeof
{
__u64 now;
- now = (get_clock() - jiffies_timer_cc) >> 12;
+ now = (get_clock() - jiffies_timer_cc) >> 12;
+ now -= (__u64) jiffies * USECS_PER_JIFFY;
return (unsigned long) now;
}
_
Patches currently in -mm which might be from heiko.carstens@xxxxxxxxxx are
git-s390.patch
reduce-max_nr_zones-remove-display-of-counters-for-unconfigured-zones-s390-fix-fix.patch
slab-respect-architecture-and-caller-mandated-alignment.patch
bootmem-use-max_dma_address-instead-of-low32limit.patch
s390-fix-cmm-kernel-thread-handling.patch
make-touch_nmi_watchdog-imply-touch_softlockup_watchdog-on-fix.patch
kill-wall_jiffies-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
