summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-12 07:47:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-12 07:47:44 -0700
commitdc10885d68ae5893038e009f82cbb14a05aa9dd0 (patch)
tree873929ff5bbb9263d1a325abd0f6a4c8fe26d208 /arch/x86
parent631025b4d87d5a9d7e04a1ed652d247191e223d4 (diff)
parent9412e28649d0272df5e4af57bb378926fd4df580 (diff)
downloadop-kernel-dev-dc10885d68ae5893038e009f82cbb14a05aa9dd0.zip
op-kernel-dev-dc10885d68ae5893038e009f82cbb14a05aa9dd0.tar.gz
Merge branch 'core/iter-div' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core/iter-div' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: always_inline timespec_add_ns add an inlined version of iter_div_u64_rem common implementation of iterative div/mod
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/xen/time.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
index c39e1a5..52b2e38 100644
--- a/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
@@ -12,6 +12,7 @@
#include <linux/clocksource.h>
#include <linux/clockchips.h>
#include <linux/kernel_stat.h>
+#include <linux/math64.h>
#include <asm/xen/hypervisor.h>
#include <asm/xen/hypercall.h>
@@ -150,11 +151,7 @@ static void do_stolen_accounting(void)
if (stolen < 0)
stolen = 0;
- ticks = 0;
- while (stolen >= NS_PER_TICK) {
- ticks++;
- stolen -= NS_PER_TICK;
- }
+ ticks = iter_div_u64_rem(stolen, NS_PER_TICK, &stolen);
__get_cpu_var(residual_stolen) = stolen;
account_steal_time(NULL, ticks);
@@ -166,11 +163,7 @@ static void do_stolen_accounting(void)
if (blocked < 0)
blocked = 0;
- ticks = 0;
- while (blocked >= NS_PER_TICK) {
- ticks++;
- blocked -= NS_PER_TICK;
- }
+ ticks = iter_div_u64_rem(blocked, NS_PER_TICK, &blocked);
__get_cpu_var(residual_blocked) = blocked;
account_steal_time(idle_task(smp_processor_id()), ticks);
}
OpenPOWER on IntegriCloud