Merge tag 'pwm/for-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[firefly-linux-kernel-4.4.55.git] / arch / powerpc / include / asm / cputime.h

diff --git a/arch/powerpc/include/asm/cputime.h b/arch/powerpc/include/asm/cputime.h
index 6c840ceab8201cc191f4699d15561c62b2e0c9c2..e2452550bcb16322ddab48582fa93a632bba80b5 100644 (file)
--- a/arch/powerpc/include/asm/cputime.h
+++ b/arch/powerpc/include/asm/cputime.h
@@ -58,10 +58,10 @@ static inline unsigned long cputime_to_jiffies(const cputime_t ct)
 static inline cputime_t cputime_to_scaled(const cputime_t ct)
 {
        if (cpu_has_feature(CPU_FTR_SPURR) &&
-           __get_cpu_var(cputime_last_delta))
+           __this_cpu_read(cputime_last_delta))
                return (__force u64) ct *
-                       __get_cpu_var(cputime_scaled_last_delta) /
-                       __get_cpu_var(cputime_last_delta);
+                       __this_cpu_read(cputime_scaled_last_delta) /
+                       __this_cpu_read(cputime_last_delta);
        return ct;
 }