git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
[pandora-kernel.git]
/
arch
/
s390
/
kernel
/
vdso32
/
clock_gettime.S
diff --git
a/arch/s390/kernel/vdso32/clock_gettime.S
b/arch/s390/kernel/vdso32/clock_gettime.S
index
4a98909
..
9696439
100644
(file)
--- 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
sl %r1,__VDSO_XTIME_STAMP+4(%r5)
brc 3,2f
ahi %r0,-1
-2: m
hi %r0,1000
/* cyc2ns(clock,cycle_delta) */
+2: m
s %r0,__VDSO_NTP_MULT(%r5)
/* cyc2ns(clock,cycle_delta) */
lr %r2,%r0
lr %r2,%r0
- l
hi %r0,1000
+ l
%r0,__VDSO_NTP_MULT(%r5)
ltr %r1,%r1
mr %r0,%r0
jnm 3f
ltr %r1,%r1
mr %r0,%r0
jnm 3f
- a
hi %r0,1000
+ a
%r0,__VDSO_NTP_MULT(%r5)
3: alr %r0,%r2
srdl %r0,12
al %r0,__VDSO_XTIME_NSEC(%r5) /* + xtime */
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
sl %r1,__VDSO_XTIME_STAMP+4(%r5)
brc 3,12f
ahi %r0,-1
-12: m
hi %r0,1000
/* cyc2ns(clock,cycle_delta) */
+12: m
s %r0,__VDSO_NTP_MULT(%r5)
/* cyc2ns(clock,cycle_delta) */
lr %r2,%r0
lr %r2,%r0
- l
hi %r0,1000
+ l
%r0,__VDSO_NTP_MULT(%r5)
ltr %r1,%r1
mr %r0,%r0
jnm 13f
ltr %r1,%r1
mr %r0,%r0
jnm 13f
- a
hi %r0,1000
+ a
%r0,__VDSO_NTP_MULT(%r5)
13: alr %r0,%r2
srdl %r0,12
al %r0,__VDSO_XTIME_NSEC(%r5) /* + xtime */
13: alr %r0,%r2
srdl %r0,12
al %r0,__VDSO_XTIME_NSEC(%r5) /* + xtime */