diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-09-26 21:05:54 +0200 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-09-26 21:05:54 +0200 |
| commit | 17deb9c2db01c7813611291d251d8c7dbdfd3c9d (patch) | |
| tree | 6e023c0be7c64de84dd51a671eb09c5c82b56615 /drivers/cpufreq/longrun.c | |
| parent | clocksource: vf_pit_timer: Switch to sched_clock_register() (diff) | |
| parent | Merge branch 'fortglx/3.12/time' into fortglx/3.13/time (diff) | |
| download | linux-17deb9c2db01c7813611291d251d8c7dbdfd3c9d.tar.xz linux-17deb9c2db01c7813611291d251d8c7dbdfd3c9d.zip | |
Merge remote-tracking branch 'tip/timers/core' into fordlezcano/3.13/sched-clock64-conversion
Update to tip/timers/core and resolve minor conflict.
Conflicts:
drivers/clocksource/samsung_pwm_timer.c
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'drivers/cpufreq/longrun.c')
| -rw-r--r-- | drivers/cpufreq/longrun.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/cpufreq/longrun.c b/drivers/cpufreq/longrun.c index 8bc9f5fbbaeb..5aa031612d53 100644 --- a/drivers/cpufreq/longrun.c +++ b/drivers/cpufreq/longrun.c @@ -33,7 +33,7 @@ static unsigned int longrun_low_freq, longrun_high_freq; * Reads the current LongRun policy by access to MSR_TMTA_LONGRUN_FLAGS * and MSR_TMTA_LONGRUN_CTRL */ -static void __cpuinit longrun_get_policy(struct cpufreq_policy *policy) +static void longrun_get_policy(struct cpufreq_policy *policy) { u32 msr_lo, msr_hi; @@ -163,7 +163,7 @@ static unsigned int longrun_get(unsigned int cpu) * TMTA rules: * performance_pctg = (target_freq - low_freq)/(high_freq - low_freq) */ -static int __cpuinit longrun_determine_freqs(unsigned int *low_freq, +static int longrun_determine_freqs(unsigned int *low_freq, unsigned int *high_freq) { u32 msr_lo, msr_hi; @@ -256,7 +256,7 @@ static int __cpuinit longrun_determine_freqs(unsigned int *low_freq, } -static int __cpuinit longrun_cpu_init(struct cpufreq_policy *policy) +static int longrun_cpu_init(struct cpufreq_policy *policy) { int result = 0; @@ -286,7 +286,6 @@ static struct cpufreq_driver longrun_driver = { .get = longrun_get, .init = longrun_cpu_init, .name = "longrun", - .owner = THIS_MODULE, }; static const struct x86_cpu_id longrun_ids[] = { |