From: Heiko Carstens <[email protected]>
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 <[email protected]>
Cc: Martin Schwidefsky <[email protected]>
Signed-off-by: Heiko Carstens <[email protected]>
---
arch/s390/kernel/time.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: linux-2.6.18-rc4-mm3/arch/s390/kernel/time.c
===================================================================
--- linux-2.6.18-rc4-mm3.orig/arch/s390/kernel/time.c 2006-08-28 10:32:45.000000000 +0200
+++ linux-2.6.18-rc4-mm3/arch/s390/kernel/time.c 2006-08-28 10:42:33.000000000 +0200
@@ -85,7 +85,8 @@
{
__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;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
