1 files changed, 6 insertions, 6 deletions
diff --git a/arch/s390/kernel/vdso32/clock_gettime.S b/arch/s390/kernel/vdso32/clock_gettime.S
index 4a98909a8310..969643954273 100644
--- a/arch/s390/kernel/vdso32/clock_gettime.S
+++ b/arch/s390/kernel/vdso32/clock_gettime.S
@@ -38,13 +38,13 @@ __kernel_clock_gettime:
        sl      %r1,__VDSO_XTIME_STAMP+4(%r5)
        brc     3,2f
        ahi     %r0,-1
-2:      mhi     %r0,1000                        /* cyc2ns(clock,cycle_delta) */
+2:      ms      %r0,__VDSO_NTP_MULT(%r5)        /* cyc2ns(clock,cycle_delta) */
        lr      %r2,%r0
-        lhi     %r0,1000
+        l       %r0,__VDSO_NTP_MULT(%r5)
        ltr     %r1,%r1
        mr      %r0,%r0
        jnm     3f
-        ahi     %r0,1000
+        a       %r0,__VDSO_NTP_MULT(%r5)
 3:      alr     %r0,%r2
        srdl    %r0,12
        al      %r0,__VDSO_XTIME_NSEC(%r5)      /*  + xtime */
@@ -86,13 +86,13 @@ __kernel_clock_gettime:
        sl      %r1,__VDSO_XTIME_STAMP+4(%r5)
        brc     3,12f
        ahi     %r0,-1
-12:     mhi     %r0,1000                        /* cyc2ns(clock,cycle_delta) */
+12:     ms      %r0,__VDSO_NTP_MULT(%r5)        /* cyc2ns(clock,cycle_delta) */
        lr      %r2,%r0
-        lhi     %r0,1000
+        l       %r0,__VDSO_NTP_MULT(%r5)
        ltr     %r1,%r1
        mr      %r0,%r0
        jnm     13f
-        ahi     %r0,1000
+        a       %r0,__VDSO_NTP_MULT(%r5)
 13:     alr     %r0,%r2
        srdl    %r0,12
        al      %r0,__VDSO_XTIME_NSEC(%r5)      /*  + xtime */

diff --git a/arch/s390/kernel/vdso32/clock_gettime.S b/arch/s390/kernel/vdso32/clock_gettime.S index 4a98909a8310..969643954273 100644 --- a/arch/s390/kernel/vdso32/clock_gettime.S +++ b/arch/s390/kernel/vdso32/clock_gettime.S
@@ -38,13 +38,13 @@ __kernel_clock_gettime:
38	sl %r1,__VDSO_XTIME_STAMP+4(%r5)	38	sl %r1,__VDSO_XTIME_STAMP+4(%r5)
39	brc 3,2f	39	brc 3,2f
40	ahi %r0,-1	40	ahi %r0,-1
41	2: mhi %r0,1000 /* cyc2ns(clock,cycle_delta) */	41	2: ms %r0,__VDSO_NTP_MULT(%r5) /* cyc2ns(clock,cycle_delta) */
42	lr %r2,%r0	42	lr %r2,%r0
43	lhi %r0,1000	43	l %r0,__VDSO_NTP_MULT(%r5)
44	ltr %r1,%r1	44	ltr %r1,%r1
45	mr %r0,%r0	45	mr %r0,%r0
46	jnm 3f	46	jnm 3f
47	ahi %r0,1000	47	a %r0,__VDSO_NTP_MULT(%r5)
48	3: alr %r0,%r2	48	3: alr %r0,%r2
49	srdl %r0,12	49	srdl %r0,12
50	al %r0,__VDSO_XTIME_NSEC(%r5) /* + xtime */	50	al %r0,__VDSO_XTIME_NSEC(%r5) /* + xtime */
@@ -86,13 +86,13 @@ __kernel_clock_gettime:
86	sl %r1,__VDSO_XTIME_STAMP+4(%r5)	86	sl %r1,__VDSO_XTIME_STAMP+4(%r5)
87	brc 3,12f	87	brc 3,12f
88	ahi %r0,-1	88	ahi %r0,-1
89	12: mhi %r0,1000 /* cyc2ns(clock,cycle_delta) */	89	12: ms %r0,__VDSO_NTP_MULT(%r5) /* cyc2ns(clock,cycle_delta) */
90	lr %r2,%r0	90	lr %r2,%r0
91	lhi %r0,1000	91	l %r0,__VDSO_NTP_MULT(%r5)
92	ltr %r1,%r1	92	ltr %r1,%r1
93	mr %r0,%r0	93	mr %r0,%r0
94	jnm 13f	94	jnm 13f
95	ahi %r0,1000	95	a %r0,__VDSO_NTP_MULT(%r5)
96	13: alr %r0,%r2	96	13: alr %r0,%r2
97	srdl %r0,12	97	srdl %r0,12
98	al %r0,__VDSO_XTIME_NSEC(%r5) /* + xtime */	98	al %r0,__VDSO_XTIME_NSEC(%r5) /* + xtime */