diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-22 08:43:59 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-22 08:43:59 -0700 |
commit | c81eddb0e3728661d1585fbc564449c94165cc36 (patch) | |
tree | bd7dbc09bec4c1c90552718d48fb7f30b94e0265 /arch/s390/kernel/vdso32/gettimeofday.S | |
parent | a28ca3f3244dfe05d16c67f2c0636ce6bf2b4e0a (diff) | |
parent | 76ef964c78797f9baed7c2f9a58f696e86d8a048 (diff) | |
download | linux-c81eddb0e3728661d1585fbc564449c94165cc36.tar.bz2 |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] zcore: Fix reipl device detection
[S390] vdso: use ntp adjusted clock multiplier
[S390] cio: use exception-save stsch
[S390] add hook to reenable mss after hibernation
[S390] cio: allow enable_facility from outside init functions
[S390] dasd: fix endless loop in erp
Diffstat (limited to 'arch/s390/kernel/vdso32/gettimeofday.S')
-rw-r--r-- | arch/s390/kernel/vdso32/gettimeofday.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/kernel/vdso32/gettimeofday.S b/arch/s390/kernel/vdso32/gettimeofday.S index ad8acfc949fb..2d3633175e3b 100644 --- a/arch/s390/kernel/vdso32/gettimeofday.S +++ b/arch/s390/kernel/vdso32/gettimeofday.S @@ -35,13 +35,13 @@ __kernel_gettimeofday: sl %r1,__VDSO_XTIME_STAMP+4(%r5) brc 3,3f ahi %r0,-1 -3: mhi %r0,1000 /* cyc2ns(clock,cycle_delta) */ +3: ms %r0,__VDSO_NTP_MULT(%r5) /* cyc2ns(clock,cycle_delta) */ st %r0,24(%r15) - lhi %r0,1000 + l %r0,__VDSO_NTP_MULT(%r5) ltr %r1,%r1 mr %r0,%r0 jnm 4f - ahi %r0,1000 + a %r0,__VDSO_NTP_MULT(%r5) 4: al %r0,24(%r15) srdl %r0,12 al %r0,__VDSO_XTIME_NSEC(%r5) /* + xtime */ |