diff options
Diffstat (limited to 'arch/powerpc/kernel/vdso64')
-rw-r--r-- | arch/powerpc/kernel/vdso64/gettimeofday.S | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/vdso64/gettimeofday.S b/arch/powerpc/kernel/vdso64/gettimeofday.S index 40ffd9b6cef7..2d7a5104c666 100644 --- a/arch/powerpc/kernel/vdso64/gettimeofday.S +++ b/arch/powerpc/kernel/vdso64/gettimeofday.S | |||
@@ -1,5 +1,4 @@ | |||
1 | 1 | /* | |
2 | /* | ||
3 | * Userland implementation of gettimeofday() for 64 bits processes in a | 2 | * Userland implementation of gettimeofday() for 64 bits processes in a |
4 | * ppc64 kernel for use in the vDSO | 3 | * ppc64 kernel for use in the vDSO |
5 | * | 4 | * |
@@ -32,6 +31,8 @@ V_FUNCTION_BEGIN(__kernel_gettimeofday) | |||
32 | mr r11,r3 /* r11 holds tv */ | 31 | mr r11,r3 /* r11 holds tv */ |
33 | mr r10,r4 /* r10 holds tz */ | 32 | mr r10,r4 /* r10 holds tz */ |
34 | bl V_LOCAL_FUNC(__get_datapage) /* get data page */ | 33 | bl V_LOCAL_FUNC(__get_datapage) /* get data page */ |
34 | cmpldi r10,0 /* check if tv is NULL */ | ||
35 | beq 2f | ||
35 | bl V_LOCAL_FUNC(__do_get_xsec) /* get xsec from tb & kernel */ | 36 | bl V_LOCAL_FUNC(__do_get_xsec) /* get xsec from tb & kernel */ |
36 | lis r7,15 /* r7 = 1000000 = USEC_PER_SEC */ | 37 | lis r7,15 /* r7 = 1000000 = USEC_PER_SEC */ |
37 | ori r7,r7,16960 | 38 | ori r7,r7,16960 |
@@ -43,8 +44,8 @@ V_FUNCTION_BEGIN(__kernel_gettimeofday) | |||
43 | * XSEC_PER_SEC | 44 | * XSEC_PER_SEC |
44 | */ | 45 | */ |
45 | rldicl r0,r0,44,20 | 46 | rldicl r0,r0,44,20 |
46 | cmpldi cr0,r10,0 /* check if tz is NULL */ | ||
47 | std r0,TVAL64_TV_USEC(r11) /* store usec in tv */ | 47 | std r0,TVAL64_TV_USEC(r11) /* store usec in tv */ |
48 | 2: cmpldi r10,0 /* check if tz is NULL */ | ||
48 | beq 1f | 49 | beq 1f |
49 | lwz r4,CFG_TZ_MINUTEWEST(r3)/* fill tz */ | 50 | lwz r4,CFG_TZ_MINUTEWEST(r3)/* fill tz */ |
50 | lwz r5,CFG_TZ_DSTTIME(r3) | 51 | lwz r5,CFG_TZ_DSTTIME(r3) |