diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-26 16:49:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-26 16:49:57 -0700 |
| commit | 2c9dbda360d96819456f845ea92e20e4e9d0ed36 (patch) | |
| tree | eca42c0d0ad7b4092b6b90eef3c50ef52a209970 /arch/powerpc/kernel/vdso64/gettimeofday.S | |
| parent | 9a08e732533b940d2d31f4e9999dfee5e1ca3914 (diff) | |
| parent | ae62fbb5f1f796d87cbdbe6701e13f2b52d5c0a7 (diff) | |
| download | kernel_samsung_espresso10-2c9dbda360d96819456f845ea92e20e4e9d0ed36.zip kernel_samsung_espresso10-2c9dbda360d96819456f845ea92e20e4e9d0ed36.tar.gz kernel_samsung_espresso10-2c9dbda360d96819456f845ea92e20e4e9d0ed36.tar.bz2 | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Fix subtle FP state corruption bug in signal return on SMP
[POWERPC] Fix VDSO gettimeofday() when called with NULL struct timeval
[POWERPC] Update defconfigs
[POWERPC] Update g5_defconfig
Diffstat (limited to 'arch/powerpc/kernel/vdso64/gettimeofday.S')
| -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 40ffd9b..2d7a510 100644 --- a/arch/powerpc/kernel/vdso64/gettimeofday.S +++ b/arch/powerpc/kernel/vdso64/gettimeofday.S @@ -1,5 +1,4 @@ - - /* +/* * Userland implementation of gettimeofday() for 64 bits processes in a * ppc64 kernel for use in the vDSO * @@ -32,6 +31,8 @@ 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 */ + beq 2f bl V_LOCAL_FUNC(__do_get_xsec) /* get xsec from tb & kernel */ lis r7,15 /* r7 = 1000000 = USEC_PER_SEC */ ori r7,r7,16960 @@ -43,8 +44,8 @@ V_FUNCTION_BEGIN(__kernel_gettimeofday) * XSEC_PER_SEC */ rldicl r0,r0,44,20 - cmpldi cr0,r10,0 /* check if tz is NULL */ std r0,TVAL64_TV_USEC(r11) /* store usec in tv */ +2: cmpldi r10,0 /* check if tz is NULL */ beq 1f lwz r4,CFG_TZ_MINUTEWEST(r3)/* fill tz */ lwz r5,CFG_TZ_DSTTIME(r3) |