diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-08 00:24:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-08 00:24:38 -0500 |
| commit | 24f030175d30f019be41766cdf88c2ff03de19ff (patch) | |
| tree | 354232a84e82d5a721ed7b1a9af580ff2a59be8f /arch/s390/kernel/vdso64/clock_getres.S | |
| parent | 4aa12f7b927c3cac0e0cf3503642597527d0ece0 (diff) | |
| parent | 9e42d0cf5020aaf217433cad1a224745241d212a (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/s390/kernel/vdso64/clock_getres.S')
| -rw-r--r-- | arch/s390/kernel/vdso64/clock_getres.S | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/s390/kernel/vdso64/clock_getres.S b/arch/s390/kernel/vdso64/clock_getres.S index 488e31a3c0e..9ce8caafdb4 100644 --- a/arch/s390/kernel/vdso64/clock_getres.S +++ b/arch/s390/kernel/vdso64/clock_getres.S | |||
| @@ -22,7 +22,12 @@ __kernel_clock_getres: | |||
| 22 | cghi %r2,CLOCK_REALTIME | 22 | cghi %r2,CLOCK_REALTIME |
| 23 | je 0f | 23 | je 0f |
| 24 | cghi %r2,CLOCK_MONOTONIC | 24 | cghi %r2,CLOCK_MONOTONIC |
| 25 | je 0f | ||
| 26 | cghi %r2,-2 /* CLOCK_THREAD_CPUTIME_ID for this thread */ | ||
| 25 | jne 2f | 27 | jne 2f |
| 28 | larl %r5,_vdso_data | ||
| 29 | icm %r0,15,__LC_ECTG_OK(%r5) | ||
| 30 | jz 2f | ||
| 26 | 0: ltgr %r3,%r3 | 31 | 0: ltgr %r3,%r3 |
| 27 | jz 1f /* res == NULL */ | 32 | jz 1f /* res == NULL */ |
| 28 | larl %r1,3f | 33 | larl %r1,3f |