diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:17:52 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:17:52 -0400 |
| commit | 90890687859ea658759e653c4e70ed7e9e1a6217 (patch) | |
| tree | 9065b30bb189e16ef99b8b5a0d444558f8dc579f /arch/ppc64/kernel/vdso32/gettimeofday.S | |
| parent | 2995bfb7855aabd493f840af361f3dd7d221caea (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/ppc64/kernel/vdso32/gettimeofday.S')
| -rw-r--r-- | arch/ppc64/kernel/vdso32/gettimeofday.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/vdso32/gettimeofday.S b/arch/ppc64/kernel/vdso32/gettimeofday.S index 07f1c1c650c8..e243c1d24af7 100644 --- a/arch/ppc64/kernel/vdso32/gettimeofday.S +++ b/arch/ppc64/kernel/vdso32/gettimeofday.S | |||
| @@ -109,7 +109,7 @@ __do_get_xsec: | |||
| 109 | lwz r6,(CFG_TB_TO_XS+4)(r9) | 109 | lwz r6,(CFG_TB_TO_XS+4)(r9) |
| 110 | mulhwu r4,r7,r5 | 110 | mulhwu r4,r7,r5 |
| 111 | mulhwu r6,r7,r6 | 111 | mulhwu r6,r7,r6 |
| 112 | mullw r6,r7,r5 | 112 | mullw r0,r7,r5 |
| 113 | addc r6,r6,r0 | 113 | addc r6,r6,r0 |
| 114 | 114 | ||
| 115 | /* At this point, we have the scaled xsec value in r4 + XER:CA | 115 | /* At this point, we have the scaled xsec value in r4 + XER:CA |