Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755661AbcKOKv7 (ORCPT ); Tue, 15 Nov 2016 05:51:59 -0500 Received: from terminus.zytor.com ([198.137.202.10]:51482 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753633AbcKOKv4 (ORCPT ); Tue, 15 Nov 2016 05:51:56 -0500 Date: Tue, 15 Nov 2016 02:50:49 -0800 From: tip-bot for Stanislaw Gruszka Message-ID: Cc: linux-kernel@vger.kernel.org, paulus@ozlabs.org, tglx@linutronix.de, mingo@kernel.org, fweisbec@gmail.com, torvalds@linux-foundation.org, mikey@neuling.org, heiko.carstens@de.ibm.com, peterz@infradead.org, schwidefsky@de.ibm.com, sgruszka@redhat.com, paulus@samba.org, hpa@zytor.com, benh@kernel.crashing.org Reply-To: linux-kernel@vger.kernel.org, tglx@linutronix.de, paulus@ozlabs.org, mingo@kernel.org, mikey@neuling.org, torvalds@linux-foundation.org, fweisbec@gmail.com, peterz@infradead.org, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, paulus@samba.org, sgruszka@redhat.com, benh@kernel.crashing.org, hpa@zytor.com In-Reply-To: <1479175612-14718-2-git-send-email-fweisbec@gmail.com> References: <1479175612-14718-2-git-send-email-fweisbec@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/cputime, powerpc: Remove cputime_last_delta global variable Git-Commit-ID: 7008eb997bcfdd8c5274bb6672aa5d4e77994309 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2786 Lines: 73 Commit-ID: 7008eb997bcfdd8c5274bb6672aa5d4e77994309 Gitweb: http://git.kernel.org/tip/7008eb997bcfdd8c5274bb6672aa5d4e77994309 Author: Stanislaw Gruszka AuthorDate: Tue, 15 Nov 2016 03:06:49 +0100 Committer: Ingo Molnar CommitDate: Tue, 15 Nov 2016 09:51:04 +0100 sched/cputime, powerpc: Remove cputime_last_delta global variable Since commit: cf9efce0ce313 ("powerpc: Account time using timebase rather than PURR") cputime_last_delta is not initialized to other value than 0, hence it's not used except zero check and cputime_to_scaled() just returns the argument. Signed-off-by: Stanislaw Gruszka Signed-off-by: Frederic Weisbecker Acked-by: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: Heiko Carstens Cc: Linus Torvalds Cc: Martin Schwidefsky Cc: Michael Neuling Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1479175612-14718-2-git-send-email-fweisbec@gmail.com Signed-off-by: Ingo Molnar --- arch/powerpc/include/asm/cputime.h | 7 ------- arch/powerpc/kernel/time.c | 2 -- 2 files changed, 9 deletions(-) diff --git a/arch/powerpc/include/asm/cputime.h b/arch/powerpc/include/asm/cputime.h index 4f60db0..9f5dcf7 100644 --- a/arch/powerpc/include/asm/cputime.h +++ b/arch/powerpc/include/asm/cputime.h @@ -46,8 +46,6 @@ extern cputime_t cputime_one_jiffy; * Convert cputime <-> jiffies */ extern u64 __cputime_jiffies_factor; -DECLARE_PER_CPU(unsigned long, cputime_last_delta); -DECLARE_PER_CPU(unsigned long, cputime_scaled_last_delta); static inline unsigned long cputime_to_jiffies(const cputime_t ct) { @@ -58,11 +56,6 @@ static inline unsigned long cputime_to_jiffies(const cputime_t ct) * the last scaled to real ratio */ static inline cputime_t cputime_to_scaled(const cputime_t ct) { - if (cpu_has_feature(CPU_FTR_SPURR) && - __this_cpu_read(cputime_last_delta)) - return (__force u64) ct * - __this_cpu_read(cputime_scaled_last_delta) / - __this_cpu_read(cputime_last_delta); return ct; } diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index bc3f7d0..8105198 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -164,8 +164,6 @@ u64 __cputime_sec_factor; EXPORT_SYMBOL(__cputime_sec_factor); u64 __cputime_clockt_factor; EXPORT_SYMBOL(__cputime_clockt_factor); -DEFINE_PER_CPU(unsigned long, cputime_last_delta); -DEFINE_PER_CPU(unsigned long, cputime_scaled_last_delta); cputime_t cputime_one_jiffy;