diff options
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kernel/vdso32/clock_gettime.S | 9 | ||||
| -rw-r--r-- | arch/s390/kernel/vdso64/clock_gettime.S | 6 |
2 files changed, 4 insertions, 11 deletions
diff --git a/arch/s390/kernel/vdso32/clock_gettime.S b/arch/s390/kernel/vdso32/clock_gettime.S index 5be8e472f57d..65fc3979c2f1 100644 --- a/arch/s390/kernel/vdso32/clock_gettime.S +++ b/arch/s390/kernel/vdso32/clock_gettime.S | |||
| @@ -46,18 +46,13 @@ __kernel_clock_gettime: | |||
| 46 | jnm 3f | 46 | jnm 3f |
| 47 | a %r0,__VDSO_TK_MULT(%r5) | 47 | a %r0,__VDSO_TK_MULT(%r5) |
| 48 | 3: alr %r0,%r2 | 48 | 3: alr %r0,%r2 |
| 49 | al %r0,__VDSO_XTIME_NSEC(%r5) /* + tk->xtime_nsec */ | 49 | al %r0,__VDSO_WTOM_NSEC(%r5) |
| 50 | al %r1,__VDSO_XTIME_NSEC+4(%r5) | ||
| 51 | brc 12,4f | ||
| 52 | ahi %r0,1 | ||
| 53 | 4: al %r0,__VDSO_WTOM_NSEC(%r5) /* + wall_to_monotonic.nsec */ | ||
| 54 | al %r1,__VDSO_WTOM_NSEC+4(%r5) | 50 | al %r1,__VDSO_WTOM_NSEC+4(%r5) |
| 55 | brc 12,5f | 51 | brc 12,5f |
| 56 | ahi %r0,1 | 52 | ahi %r0,1 |
| 57 | 5: l %r2,__VDSO_TK_SHIFT(%r5) /* Timekeeper shift */ | 53 | 5: l %r2,__VDSO_TK_SHIFT(%r5) /* Timekeeper shift */ |
| 58 | srdl %r0,0(%r2) /* >> tk->shift */ | 54 | srdl %r0,0(%r2) /* >> tk->shift */ |
| 59 | l %r2,__VDSO_XTIME_SEC+4(%r5) | 55 | l %r2,__VDSO_WTOM_SEC+4(%r5) |
| 60 | al %r2,__VDSO_WTOM_SEC+4(%r5) | ||
| 61 | cl %r4,__VDSO_UPD_COUNT+4(%r5) /* check update counter */ | 56 | cl %r4,__VDSO_UPD_COUNT+4(%r5) /* check update counter */ |
| 62 | jne 1b | 57 | jne 1b |
| 63 | basr %r5,0 | 58 | basr %r5,0 |
diff --git a/arch/s390/kernel/vdso64/clock_gettime.S b/arch/s390/kernel/vdso64/clock_gettime.S index 4007007a9652..91940ed33a4a 100644 --- a/arch/s390/kernel/vdso64/clock_gettime.S +++ b/arch/s390/kernel/vdso64/clock_gettime.S | |||
| @@ -37,13 +37,11 @@ __kernel_clock_gettime: | |||
| 37 | jnz 0b | 37 | jnz 0b |
| 38 | stck 48(%r15) /* Store TOD clock */ | 38 | stck 48(%r15) /* Store TOD clock */ |
| 39 | lgf %r2,__VDSO_TK_SHIFT(%r5) /* Timekeeper shift */ | 39 | lgf %r2,__VDSO_TK_SHIFT(%r5) /* Timekeeper shift */ |
| 40 | lg %r0,__VDSO_XTIME_SEC(%r5) /* tk->xtime_sec */ | 40 | lg %r0,__VDSO_WTOM_SEC(%r5) |
| 41 | alg %r0,__VDSO_WTOM_SEC(%r5) /* + wall_to_monotonic.sec */ | ||
| 42 | lg %r1,48(%r15) | 41 | lg %r1,48(%r15) |
| 43 | sg %r1,__VDSO_XTIME_STAMP(%r5) /* TOD - cycle_last */ | 42 | sg %r1,__VDSO_XTIME_STAMP(%r5) /* TOD - cycle_last */ |
| 44 | msgf %r1,__VDSO_TK_MULT(%r5) /* * tk->mult */ | 43 | msgf %r1,__VDSO_TK_MULT(%r5) /* * tk->mult */ |
| 45 | alg %r1,__VDSO_XTIME_NSEC(%r5) /* + tk->xtime_nsec */ | 44 | alg %r1,__VDSO_WTOM_NSEC(%r5) |
| 46 | alg %r1,__VDSO_WTOM_NSEC(%r5) /* + wall_to_monotonic.nsec */ | ||
| 47 | srlg %r1,%r1,0(%r2) /* >> tk->shift */ | 45 | srlg %r1,%r1,0(%r2) /* >> tk->shift */ |
| 48 | clg %r4,__VDSO_UPD_COUNT(%r5) /* check update counter */ | 46 | clg %r4,__VDSO_UPD_COUNT(%r5) /* check update counter */ |
| 49 | jne 0b | 47 | jne 0b |