sched/cputime, powerpc: Remove cputime_last_delta global variable (7008eb99) · Commits · 戴 / test

Since commit: ("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 <sgruszka@redhat.com> Signed-off-by:

Frederic Weisbecker <fweisbec@gmail.com> Acked-by:

Paul Mackerras <paulus@ozlabs.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Michael Neuling <mikey@neuling.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/1479175612-14718-2-git-send-email-fweisbec@gmail.com Signed-off-by:

Ingo Molnar <mingo@kernel.org>

arch/powerpc/include/asm/cputime.h

+0 −7

Original line number	Diff line number	Diff line
		@@ -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;
		}

arch/powerpc/kernel/time.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -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;

Admin message