From 7f62d160d19db78bb9d0790a5045ca96b3e057f0 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Wed, 19 Oct 2005 21:23:49 -0700 Subject: [PATCH] --- yaml --- r: 10021 b: refs/heads/master c: 83bcbf8dad86c217ef70b4b4d53811422bb79dfa h: refs/heads/master i: 10019: 79f3bd310f6d7ce037e1e6582a8a01edcdeea734 v: v3 --- [refs] | 2 +- trunk/arch/ppc64/kernel/vdso32/gettimeofday.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c3405806327a..feac4664675a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6985c43f39b3d799999c390099c56ebbee27d4f4 +refs/heads/master: 83bcbf8dad86c217ef70b4b4d53811422bb79dfa diff --git a/trunk/arch/ppc64/kernel/vdso32/gettimeofday.S b/trunk/arch/ppc64/kernel/vdso32/gettimeofday.S index 07f1c1c650c8..e243c1d24af7 100644 --- a/trunk/arch/ppc64/kernel/vdso32/gettimeofday.S +++ b/trunk/arch/ppc64/kernel/vdso32/gettimeofday.S @@ -109,7 +109,7 @@ __do_get_xsec: lwz r6,(CFG_TB_TO_XS+4)(r9) mulhwu r4,r7,r5 mulhwu r6,r7,r6 - mullw r6,r7,r5 + mullw r0,r7,r5 addc r6,r6,r0 /* At this point, we have the scaled xsec value in r4 + XER:CA