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://git390.marist.edu/pub/scm/linux-2.6
[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
9696439
..
b2224e0
100644
(file)
--- a/
arch/s390/kernel/vdso32/clock_gettime.S
+++ b/
arch/s390/kernel/vdso32/clock_gettime.S
@@
-21,9
+21,9
@@
__kernel_clock_gettime:
.cfi_startproc
basr %r5,0
0: al %r5,21f-0b(%r5) /* get &_vdso_data */
- chi %r2,CLOCK_REALTIME
+ chi %r2,
__
CLOCK_REALTIME
je 10f
- chi %r2,CLOCK_MONOTONIC
+ chi %r2,
__
CLOCK_MONOTONIC
jne 19f
/* CLOCK_MONOTONIC */