Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f8c480f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq 

* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] constify some data tables.
  [CPUFREQ] constify cpufreq_driver where possible.
  {rd,wr}msr_on_cpu SMP=n optimization
  [CPUFREQ] cpufreq_ondemand.c: don't use _WORK_NAR
  rdmsr_on_cpu, wrmsr_on_cpu
  [CPUFREQ] Revert default on deprecated config X86_SPEEDSTEP_CENTRINO_ACPI
parents 038c068f bd5ab26a

arch/i386/kernel/cpu/cpufreq/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ config X86_SPEEDSTEP_CENTRINO_ACPI 
	bool "Use ACPI tables to decode valid frequency/voltage (deprecated)"

	depends on X86_SPEEDSTEP_CENTRINO && ACPI_PROCESSOR

	depends on !(X86_SPEEDSTEP_CENTRINO = y && ACPI_PROCESSOR = m)

	default y

	help

	  This is deprecated and this functionality is now merged into

	  acpi_cpufreq (X86_ACPI_CPUFREQ). Use that driver instead of

arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ static int nforce2_cpu_exit(struct cpufreq_policy *policy) 
	return 0;

}



static struct cpufreq_driver nforce2_driver = {

static const struct cpufreq_driver nforce2_driver = {

	.name = "nforce2",

	.verify = nforce2_verify,

	.target = nforce2_target,

arch/i386/kernel/cpu/cpufreq/e_powersaver.c

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ static struct freq_attr* eps_attr[] = { 
	NULL,

};



static struct cpufreq_driver eps_driver = {

static const struct cpufreq_driver eps_driver = {

	.verify		= eps_verify,

	.target		= eps_target,

	.init		= eps_cpu_init,

arch/i386/kernel/cpu/cpufreq/elanfreq.c

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ static struct freq_attr* elanfreq_attr[] = { 
};





static struct cpufreq_driver elanfreq_driver = {

static const struct cpufreq_driver elanfreq_driver = {

	.get		= elanfreq_get_cpu_frequency,

	.verify		= elanfreq_verify,

	.target		= elanfreq_target,

arch/i386/kernel/cpu/cpufreq/gx-suspmod.c

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ static int cpufreq_gx_cpu_init(struct cpufreq_policy *policy) 
 * cpufreq_gx_init:

 *   MediaGX/Geode GX initialize cpufreq driver

 */

static struct cpufreq_driver gx_suspmod_driver = {

static const struct cpufreq_driver gx_suspmod_driver = {

	.get		= gx_get_cpuspeed,

	.verify		= cpufreq_gx_verify,

	.target		= cpufreq_gx_target,