Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752974AbbD3VYX (ORCPT ); Thu, 30 Apr 2015 17:24:23 -0400 Received: from shelob.surriel.com ([74.92.59.67]:40955 "EHLO shelob.surriel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752512AbbD3VYU (ORCPT ); Thu, 30 Apr 2015 17:24:20 -0400 From: riel@redhat.com To: linux-kernel@vger.kernel.org Cc: x86@kernel.org, williams@redhat.com, luto@kernel.org, mingo@kernel.org, bonzini@redhat.com, fweisbec@redhat.com, peterz@infradead.org, heiko.carstens@de.ibm.com, tglx@linutronix.de, Andy Lutomirsky , Rik van Riel Subject: [PATCH 1/3] reduce indentation in __acct_update_integrals Date: Thu, 30 Apr 2015 17:23:53 -0400 Message-Id: <1430429035-25563-2-git-send-email-riel@redhat.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1430429035-25563-1-git-send-email-riel@redhat.com> References: <1430429035-25563-1-git-send-email-riel@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2049 Lines: 72 From: Peter Zijlstra Reduce indentation in __acct_update_integrals. Cc: Andy Lutomirsky Cc: Frederic Weisbecker Cc: Peter Zijlstra Cc: Heiko Carstens Cc: Thomas Gleixner Signed-off-by: Peter Zijlstra Signed-off-by: Rik van Riel --- kernel/tsacct.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/kernel/tsacct.c b/kernel/tsacct.c index 975cb49e32bf..9e225425bc3a 100644 --- a/kernel/tsacct.c +++ b/kernel/tsacct.c @@ -123,27 +123,27 @@ void xacct_add_tsk(struct taskstats *stats, struct task_struct *p) static void __acct_update_integrals(struct task_struct *tsk, cputime_t utime, cputime_t stime) { - if (likely(tsk->mm)) { - cputime_t time, dtime; - struct timeval value; - unsigned long flags; - u64 delta; - - local_irq_save(flags); - time = stime + utime; - dtime = time - tsk->acct_timexpd; - jiffies_to_timeval(cputime_to_jiffies(dtime), &value); - delta = value.tv_sec; - delta = delta * USEC_PER_SEC + value.tv_usec; - - if (delta == 0) - goto out; + cputime_t time, dtime; + struct timeval value; + unsigned long flags; + u64 delta; + + if (unlikely(!tsk->mm)) + return; + + local_irq_save(flags); + time = stime + utime; + dtime = time - tsk->acct_timexpd; + jiffies_to_timeval(cputime_to_jiffies(dtime), &value); + delta = value.tv_sec; + delta = delta * USEC_PER_SEC + value.tv_usec; + + if (delta) { tsk->acct_timexpd = time; tsk->acct_rss_mem1 += delta * get_mm_rss(tsk->mm); tsk->acct_vm_mem1 += delta * tsk->mm->total_vm; - out: - local_irq_restore(flags); } + local_irq_restore(flags); } /** -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/