diff options
author | Stratos Karafotis <stratosk@semaphore.gr> | 2013-06-05 12:01:42 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-25 19:06:43 -0400 |
commit | 61c63e5ed3b9c472899d7152e961f2ffaafcf5a0 (patch) | |
tree | e84b694d4640fd0e1ba527ec63e41e3edfddeb04 /arch/x86/include/asm/processor.h | |
parent | dfa5bb622555d9da0df21b50f46ebdeef390041b (diff) |
cpufreq: Remove unused APERF/MPERF support
The target frequency calculation method in the ondemand governor has
changed and it is now independent of the measured average frequency.
Consequently, the APERF/MPERF support in cpufreq is not used any
more, so drop it.
[rjw: Changelog]
Signed-off-by: Stratos Karafotis <stratosk@semaphore.gr>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'arch/x86/include/asm/processor.h')
-rw-r--r-- | arch/x86/include/asm/processor.h | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 24cf5aefb704..4f4a3d98c170 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h | |||
@@ -942,35 +942,6 @@ extern int set_tsc_mode(unsigned int val); | |||
942 | 942 | ||
943 | extern u16 amd_get_nb_id(int cpu); | 943 | extern u16 amd_get_nb_id(int cpu); |
944 | 944 | ||
945 | struct aperfmperf { | ||
946 | u64 aperf, mperf; | ||
947 | }; | ||
948 | |||
949 | static inline void get_aperfmperf(struct aperfmperf *am) | ||
950 | { | ||
951 | WARN_ON_ONCE(!boot_cpu_has(X86_FEATURE_APERFMPERF)); | ||
952 | |||
953 | rdmsrl(MSR_IA32_APERF, am->aperf); | ||
954 | rdmsrl(MSR_IA32_MPERF, am->mperf); | ||
955 | } | ||
956 | |||
957 | #define APERFMPERF_SHIFT 10 | ||
958 | |||
959 | static inline | ||
960 | unsigned long calc_aperfmperf_ratio(struct aperfmperf *old, | ||
961 | struct aperfmperf *new) | ||
962 | { | ||
963 | u64 aperf = new->aperf - old->aperf; | ||
964 | u64 mperf = new->mperf - old->mperf; | ||
965 | unsigned long ratio = aperf; | ||
966 | |||
967 | mperf >>= APERFMPERF_SHIFT; | ||
968 | if (mperf) | ||
969 | ratio = div64_u64(aperf, mperf); | ||
970 | |||
971 | return ratio; | ||
972 | } | ||
973 | |||
974 | extern unsigned long arch_align_stack(unsigned long sp); | 945 | extern unsigned long arch_align_stack(unsigned long sp); |
975 | extern void free_init_pages(char *what, unsigned long begin, unsigned long end); | 946 | extern void free_init_pages(char *what, unsigned long begin, unsigned long end); |
976 | 947 | ||