From 353c4d9bb6e503c42570a94e78382071bac8dbde Mon Sep 17 00:00:00 2001 From: Will Schmidt Date: Fri, 29 Jun 2007 15:49:50 -0500 Subject: [PATCH] --- yaml --- r: 58102 b: refs/heads/master c: fde937d826e43c9fe7fecc98b6f3da7188e76930 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/vdso64/gettimeofday.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1c40dba63432..7bd6e505d3e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0471448f4d017470995d8a2272dc8c06dbed3b77 +refs/heads/master: fde937d826e43c9fe7fecc98b6f3da7188e76930 diff --git a/trunk/arch/powerpc/kernel/vdso64/gettimeofday.S b/trunk/arch/powerpc/kernel/vdso64/gettimeofday.S index 2d7a5104c666..c6401f9e37f1 100644 --- a/trunk/arch/powerpc/kernel/vdso64/gettimeofday.S +++ b/trunk/arch/powerpc/kernel/vdso64/gettimeofday.S @@ -31,7 +31,7 @@ V_FUNCTION_BEGIN(__kernel_gettimeofday) mr r11,r3 /* r11 holds tv */ mr r10,r4 /* r10 holds tz */ bl V_LOCAL_FUNC(__get_datapage) /* get data page */ - cmpldi r10,0 /* check if tv is NULL */ + cmpldi r11,0 /* check if tv is NULL */ beq 2f bl V_LOCAL_FUNC(__do_get_xsec) /* get xsec from tb & kernel */ lis r7,15 /* r7 = 1000000 = USEC_PER_SEC */