Skip to content

Commit

Permalink
Merge branch 'pm-cpufreq'
Browse files Browse the repository at this point in the history
* pm-cpufreq:
  cpufreq: s5pv210: Remove spurious __init annotation
  cpufreq: intel_pstate: Add CPU ID for Braswell processor
  intel_pstate: Turn per cpu printk into pr_debug
  • Loading branch information
Rafael J. Wysocki committed Aug 27, 2014
2 parents 772c713 + dc26874 commit 0b4f58b
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion drivers/cpufreq/intel_pstate.c
Original file line number Diff line number Diff line change
@@ -660,6 +660,7 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = {
ICPU(0x3f, core_params),
ICPU(0x45, core_params),
ICPU(0x46, core_params),
ICPU(0x4c, byt_params),
ICPU(0x4f, core_params),
ICPU(0x56, core_params),
{}
@@ -688,7 +689,7 @@ static int intel_pstate_init_cpu(unsigned int cpunum)

add_timer_on(&cpu->timer, cpunum);

pr_info("Intel pstate controlling: cpu %d\n", cpunum);
pr_debug("Intel pstate controlling: cpu %d\n", cpunum);

return 0;
}
2 changes: 1 addition & 1 deletion drivers/cpufreq/s5pv210-cpufreq.c
Original file line number Diff line number Diff line change
@@ -501,7 +501,7 @@ static int check_mem_type(void __iomem *dmc_reg)
return val >> 8;
}

static int __init s5pv210_cpu_init(struct cpufreq_policy *policy)
static int s5pv210_cpu_init(struct cpufreq_policy *policy)
{
unsigned long mem_type;
int ret;

0 comments on commit 0b4f58b

Please sign in to comment.