diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-22 02:51:34 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-22 02:51:34 -0400 |
| commit | 985990137e81ca9fd6561cd0f7d1a9695ec57d5a (patch) | |
| tree | 7a67493285623a7356ba7065cada6728993d1a3b /arch/ppc64/kernel | |
| parent | 834289447542b7ec55c0847486616d4d53ddf891 (diff) | |
| parent | 63172cb3d5ef762dcb60a292bc7f016b85cf6e1f (diff) | |
Merge changes from linux-2.6 by hand
Diffstat (limited to 'arch/ppc64/kernel')
| -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 |