Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1522260

[PATCH 1/4] cputime/powerpc: Remove cputime_last_delta global variable

Show all headers | View raw

From: Stanislaw Gruszka <sgruszka@redhat.com>

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.

Acked-by: Paul Mackerras <paulus@ozlabs.org>
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Michael Neuling <mikey@neuling.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Link: http://lkml.kernel.org/r/1477917389-11341-2-git-send-email-sgruszka@redhat.com
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
---
 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;
 
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL] cputime: Scaled cputime optimizations and cleanups Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-15 03:10 +0100
  [PATCH 4/4] cputime: Simplify task_cputime() Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-15 03:10 +0100
    [tip:sched/core] sched/cputime: Simplify task_cputime() tip-bot for Stanislaw Gruszka <tipbot@zytor.com> - 2016-11-15 12:00 +0100
  [PATCH 1/4] cputime/powerpc: Remove cputime_last_delta global variable Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-15 03:10 +0100
    [tip:sched/core] sched/cputime, powerpc: Remove cputime_last_delta  global variable tip-bot for Stanislaw Gruszka <tipbot@zytor.com> - 2016-11-15 12:00 +0100
  [PATCH 2/4] cputime/powerpc: Remove cputime_to_scaled() Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-15 03:10 +0100
    [tip:sched/core] sched/cputime, powerpc: Remove cputime_to_scaled() tip-bot for Stanislaw Gruszka <tipbot@zytor.com> - 2016-11-15 12:00 +0100

csiph-web