diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2005-11-15 21:54:32 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-15 22:05:11 -0500 |
commit | 5d66da3d71e6aeca80ca08dbebd8a1cd72e6ee1f (patch) | |
tree | 1bdc54e617fc209925f33118f414ce0a4ebb62ac /arch/powerpc/kernel/vdso64/gettimeofday.S | |
parent | d3ed65832029dcaf5fe086670a2f2c25600b51e9 (diff) |
[PATCH] powerpc: Make the vDSO functions set error code (#2)
The vDSO functions should have the same calling convention as a syscall.
Unfortunately, they currently don't set the cr0.so bit which is used to
indicate an error. This patch makes them clear this bit unconditionally
since all functions currently succeed. The syscall fallback done by some
of them will eventually override this if the syscall fails.
This also changes the symbol version of all vdso exports to make sure
glibc can differenciate between old and fixed calls for existing ones
like __kernel_gettimeofday.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/vdso64/gettimeofday.S')
-rw-r--r-- | arch/powerpc/kernel/vdso64/gettimeofday.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/vdso64/gettimeofday.S b/arch/powerpc/kernel/vdso64/gettimeofday.S index 1a89094715cc..ccaeda5136d1 100644 --- a/arch/powerpc/kernel/vdso64/gettimeofday.S +++ b/arch/powerpc/kernel/vdso64/gettimeofday.S | |||
@@ -52,6 +52,7 @@ V_FUNCTION_BEGIN(__kernel_gettimeofday) | |||
52 | stw r4,TZONE_TZ_MINWEST(r10) | 52 | stw r4,TZONE_TZ_MINWEST(r10) |
53 | stw r5,TZONE_TZ_DSTTIME(r10) | 53 | stw r5,TZONE_TZ_DSTTIME(r10) |
54 | 1: mtlr r12 | 54 | 1: mtlr r12 |
55 | crclr cr0*4+so | ||
55 | li r3,0 /* always success */ | 56 | li r3,0 /* always success */ |
56 | blr | 57 | blr |
57 | .cfi_endproc | 58 | .cfi_endproc |
@@ -99,6 +100,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime) | |||
99 | std r0,TSPC64_TV_NSEC(r11) /* store nsec in tp */ | 100 | std r0,TSPC64_TV_NSEC(r11) /* store nsec in tp */ |
100 | 101 | ||
101 | mtlr r12 | 102 | mtlr r12 |
103 | crclr cr0*4+so | ||
102 | li r3,0 | 104 | li r3,0 |
103 | blr | 105 | blr |
104 | 106 | ||
@@ -159,6 +161,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime) | |||
159 | std r7,TSPC64_TV_NSEC(r11) | 161 | std r7,TSPC64_TV_NSEC(r11) |
160 | 162 | ||
161 | mtlr r12 | 163 | mtlr r12 |
164 | crclr cr0*4+so | ||
162 | li r3,0 | 165 | li r3,0 |
163 | blr | 166 | blr |
164 | 167 | ||
@@ -193,6 +196,7 @@ V_FUNCTION_BEGIN(__kernel_clock_getres) | |||
193 | 196 | ||
194 | li r3,0 | 197 | li r3,0 |
195 | cmpli cr0,r4,0 | 198 | cmpli cr0,r4,0 |
199 | crclr cr0*4+so | ||
196 | beqlr | 200 | beqlr |
197 | lis r5,CLOCK_REALTIME_RES@h | 201 | lis r5,CLOCK_REALTIME_RES@h |
198 | ori r5,r5,CLOCK_REALTIME_RES@l | 202 | ori r5,r5,CLOCK_REALTIME_RES@l |