From bf81ba135bd3cc6f22a190ca768cafda5638dfd3 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Wed, 27 Apr 2005 18:04:45 -0700 Subject: [PATCH] --- yaml --- r: 531 b: refs/heads/master c: bdceb6a0162274934386f19f3ea5a9d44feb0b20 h: refs/heads/master i: 529: 783dad199dc18f8e40a522fd97a12b749f9a6059 527: b7dfe2ced97992e210d3adac66ed59ea69f9e422 v: v3 --- [refs] | 2 +- trunk/arch/ppc64/kernel/vdso32/cacheflush.S | 2 ++ trunk/arch/ppc64/kernel/vdso32/gettimeofday.S | 1 + trunk/arch/ppc64/kernel/vdso64/cacheflush.S | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5cc8e592781a..73f5670cad95 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5fc3e624ad7278604628c598e92aa77c67064166 +refs/heads/master: bdceb6a0162274934386f19f3ea5a9d44feb0b20 diff --git a/trunk/arch/ppc64/kernel/vdso32/cacheflush.S b/trunk/arch/ppc64/kernel/vdso32/cacheflush.S index c74fddb6afd4..0ed7ea721715 100644 --- a/trunk/arch/ppc64/kernel/vdso32/cacheflush.S +++ b/trunk/arch/ppc64/kernel/vdso32/cacheflush.S @@ -47,6 +47,7 @@ V_FUNCTION_BEGIN(__kernel_sync_dicache) addi r6,r6,128 bdnz 1b isync + li r3,0 blr .cfi_endproc V_FUNCTION_END(__kernel_sync_dicache) @@ -59,6 +60,7 @@ V_FUNCTION_BEGIN(__kernel_sync_dicache_p5) .cfi_startproc sync isync + li r3,0 blr .cfi_endproc V_FUNCTION_END(__kernel_sync_dicache_p5) diff --git a/trunk/arch/ppc64/kernel/vdso32/gettimeofday.S b/trunk/arch/ppc64/kernel/vdso32/gettimeofday.S index ca7f415195c4..2b48bf1fb109 100644 --- a/trunk/arch/ppc64/kernel/vdso32/gettimeofday.S +++ b/trunk/arch/ppc64/kernel/vdso32/gettimeofday.S @@ -58,6 +58,7 @@ V_FUNCTION_BEGIN(__kernel_gettimeofday) stw r5,TZONE_TZ_DSTTIME(r11) 1: mtlr r12 + li r3,0 blr 2: mr r3,r10 diff --git a/trunk/arch/ppc64/kernel/vdso64/cacheflush.S b/trunk/arch/ppc64/kernel/vdso64/cacheflush.S index d9696ffcf334..e0725b7b7003 100644 --- a/trunk/arch/ppc64/kernel/vdso64/cacheflush.S +++ b/trunk/arch/ppc64/kernel/vdso64/cacheflush.S @@ -47,6 +47,7 @@ V_FUNCTION_BEGIN(__kernel_sync_dicache) addi r6,r6,128 bdnz 1b isync + li r3,0 blr .cfi_endproc V_FUNCTION_END(__kernel_sync_dicache) @@ -59,6 +60,7 @@ V_FUNCTION_BEGIN(__kernel_sync_dicache_p5) .cfi_startproc sync isync + li r3,0 blr .cfi_endproc V_FUNCTION_END(__kernel_sync_dicache_p5)