From 4efbffe8e3da599756444fbf6bfe9c20fc91f891 Mon Sep 17 00:00:00 2001
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Fri, 24 Jul 2009 12:39:52 +0200
Subject: [PATCH] --- yaml --- r: 155759 b: refs/heads/master c:
 1277580fe5dfb5aef84854bdb7983657df00b920 h: refs/heads/master i:   155757:
 ea7a462a12dcd475636c237e75d6d8bc5a09cf23   155755:
 6ab48c72c5721570f96d53d6cd35f21b316fa933   155751:
 324c392b5cedcfb3d8e79a6d206162cbeac66073   155743:
 15da71c51e0d28929e215a543aa4863843ccf91c v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/s390/kernel/vdso64/clock_gettime.S | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 98afbfcbe1b2..f0191d1943ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a6ba4600d6fb913ddb0dd08843ad75405795883
+refs/heads/master: 1277580fe5dfb5aef84854bdb7983657df00b920
diff --git a/trunk/arch/s390/kernel/vdso64/clock_gettime.S b/trunk/arch/s390/kernel/vdso64/clock_gettime.S
index 79dbfee831ec..49106c6e6f88 100644
--- a/trunk/arch/s390/kernel/vdso64/clock_gettime.S
+++ b/trunk/arch/s390/kernel/vdso64/clock_gettime.S
@@ -88,10 +88,17 @@ __kernel_clock_gettime:
 	llilh	%r4,0x0100
 	sar	%a4,%r4
 	lghi	%r4,0
+	epsw	%r5,0
 	sacf	512				/* Magic ectg instruction */
 	.insn	ssf,0xc80100000000,__VDSO_ECTG_BASE(4),__VDSO_ECTG_USER(4),4
-	sacf	0
-	sar	%a4,%r2
+	tml	%r5,0x4000
+	jo	11f
+	tml	%r5,0x8000
+	jno	10f
+	sacf	256
+	j	11f
+10:	sacf	0
+11:	sar	%a4,%r2
 	algr	%r1,%r0				/* r1 = cputime as TOD value */
 	mghi	%r1,1000			/* convert to nanoseconds */
 	srlg	%r1,%r1,12			/* r1 = cputime in nanosec */