projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'powerpc-4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...
[cascardo/linux.git]
/
arch
/
powerpc
/
kernel
/
vdso64
/
gettimeofday.S
diff --git
a/arch/powerpc/kernel/vdso64/gettimeofday.S
b/arch/powerpc/kernel/vdso64/gettimeofday.S
index
a76b4af
..
3820213
100644
(file)
--- a/
arch/powerpc/kernel/vdso64/gettimeofday.S
+++ b/
arch/powerpc/kernel/vdso64/gettimeofday.S
@@
-145,7
+145,7
@@
V_FUNCTION_BEGIN(__kernel_clock_getres)
bne cr0,99f
li r3,0
- cmpl
i
cr0,r4,0
+ cmpl
di
cr0,r4,0
crclr cr0*4+so
beqlr
lis r5,CLOCK_REALTIME_RES@h