diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-07 23:11:43 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-07 23:11:43 +0200 |
commit | 1133bfa6dcf034639486982629d29472737d5e96 (patch) | |
tree | 8ab074d3dc96defa0e4b2032ecfc9cf38b86caef /arch | |
parent | d8d3b4711297e101bbad826474013edbe342c333 (diff) | |
parent | cffe4e0e7413eb29fb8bd035c8b12b33a4b8522a (diff) | |
download | linux-stable-1133bfa6dcf034639486982629d29472737d5e96.tar.gz linux-stable-1133bfa6dcf034639486982629d29472737d5e96.tar.bz2 linux-stable-1133bfa6dcf034639486982629d29472737d5e96.zip |
Merge branch 'pm-cpufreq-ondemand' into pm-cpufreq
* pm-cpufreq:
cpufreq: Remove unused function __cpufreq_driver_getavg()
cpufreq: Remove unused APERF/MPERF support
cpufreq: ondemand: Change the calculation of target frequency
Diffstat (limited to 'arch')
-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); extern u16 amd_get_nb_id(int cpu); -struct aperfmperf { - u64 aperf, mperf; -}; - -static inline void get_aperfmperf(struct aperfmperf *am) -{ - WARN_ON_ONCE(!boot_cpu_has(X86_FEATURE_APERFMPERF)); - - rdmsrl(MSR_IA32_APERF, am->aperf); - rdmsrl(MSR_IA32_MPERF, am->mperf); -} - -#define APERFMPERF_SHIFT 10 - -static inline -unsigned long calc_aperfmperf_ratio(struct aperfmperf *old, - struct aperfmperf *new) -{ - u64 aperf = new->aperf - old->aperf; - u64 mperf = new->mperf - old->mperf; - unsigned long ratio = aperf; - - mperf >>= APERFMPERF_SHIFT; - if (mperf) - ratio = div64_u64(aperf, mperf); - - return ratio; -} - extern unsigned long arch_align_stack(unsigned long sp); extern void free_init_pages(char *what, unsigned long begin, unsigned long end); |