From bc5123b2ff24c3b585debcd66a39e6afd77c508c Mon Sep 17 00:00:00 2001 From: Michael Neuling Date: Tue, 20 Nov 2007 15:18:40 +1100 Subject: [PATCH] --- yaml --- r: 73954 b: refs/heads/master c: 2b46b5673ca67d23302c2afac045def988a3cade h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/time.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1e721d4bcc54..4834157e4d80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c443acab2eebf12dce7e78fe29e76786f55ad1be +refs/heads/master: 2b46b5673ca67d23302c2afac045def988a3cade diff --git a/trunk/arch/powerpc/kernel/time.c b/trunk/arch/powerpc/kernel/time.c index c0d77723ba11..a925a8eae121 100644 --- a/trunk/arch/powerpc/kernel/time.c +++ b/trunk/arch/powerpc/kernel/time.c @@ -241,8 +241,9 @@ void account_system_vtime(struct task_struct *tsk) /* deltascaled includes both user and system time. * Hence scale it based on the purr ratio to estimate * the system time */ - deltascaled = deltascaled * get_paca()->system_time / - (get_paca()->system_time + get_paca()->user_time); + if (get_paca()->user_time) + deltascaled = deltascaled * get_paca()->system_time / + (get_paca()->system_time + get_paca()->user_time); delta += get_paca()->system_time; get_paca()->system_time = 0; }