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

Commit 529980c8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents e3e3679c 52c18fd2

arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c

+10 −10
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ static int centrino_cpu_init_table(struct cpufreq_policy *policy) 


	if (model->op_points == NULL) {

		/* Matched a non-match */

		dprintk(KERN_INFO PFX "no table support for CPU model \"%s\": \n",

		dprintk(KERN_INFO PFX "no table support for CPU model \"%s\"\n",

		       cpu->x86_model_id);

#ifndef CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI

		dprintk(KERN_INFO PFX "try compiling with CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI enabled\n");
@@ -402,7 +402,7 @@ static int centrino_cpu_init_acpi(struct cpufreq_policy *policy) 


	for (i=0; i<p.state_count; i++) {

		if (p.states[i].control != p.states[i].status) {

			dprintk("Different control (%x) and status values (%x)\n",

			dprintk("Different control (%llu) and status values (%llu)\n",

				p.states[i].control, p.states[i].status);

			result = -EINVAL;

			goto err_unreg;
@@ -415,7 +415,7 @@ static int centrino_cpu_init_acpi(struct cpufreq_policy *policy) 
		}



		if (p.states[i].core_frequency > p.states[0].core_frequency) {

			dprintk("P%u has larger frequency (%u) than P0 (%u), skipping\n", i,

			dprintk("P%u has larger frequency (%llu) than P0 (%llu), skipping\n", i,

				p.states[i].core_frequency, p.states[0].core_frequency);

			p.states[i].core_frequency = 0;

			continue;
@@ -498,13 +498,6 @@ static int centrino_cpu_init(struct cpufreq_policy *policy) 
	if (cpu->x86_vendor != X86_VENDOR_INTEL || !cpu_has(cpu, X86_FEATURE_EST))

		return -ENODEV;



	for (i = 0; i < N_IDS; i++)

		if (centrino_verify_cpu_id(cpu, &cpu_ids[i]))

			break;



	if (i != N_IDS)

		centrino_cpu[policy->cpu] = &cpu_ids[i];



	if (is_const_loops_cpu(policy->cpu)) {

		centrino_driver.flags |= CPUFREQ_CONST_LOOPS;

	}
@@ -513,6 +506,13 @@ static int centrino_cpu_init(struct cpufreq_policy *policy) 
		if (policy->cpu != 0)

			return -ENODEV;



		for (i = 0; i < N_IDS; i++)

			if (centrino_verify_cpu_id(cpu, &cpu_ids[i]))

				break;



		if (i != N_IDS)

			centrino_cpu[policy->cpu] = &cpu_ids[i];



		if (!centrino_cpu[policy->cpu]) {

			dprintk(KERN_INFO PFX "found unsupported CPU with "

			"Enhanced SpeedStep: send /proc/cpuinfo to "

arch/i386/kernel/cpu/cpufreq/speedstep-smi.c

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static int speedstep_smi_get_freqs (unsigned int *low, unsigned int *high) 
	u32 function = GET_SPEEDSTEP_FREQS;



	if (!(ist_info.event & 0xFFFF)) {

		dprintk("bug #1422 -- can't read freqs from BIOS\n", result);

		dprintk("bug #1422 -- can't read freqs from BIOS\n");

		return -ENODEV;

	}

drivers/cpufreq/cpufreq.c

+5 −1
Original line number Diff line number Diff line
@@ -627,7 +627,7 @@ static int cpufreq_add_dev (struct sys_device * sys_dev) 


	ret = kobject_register(&policy->kobj);

	if (ret)

		goto err_out;

		goto err_out_driver_exit;



	/* set up files for this cpu device */

	drv_attr = cpufreq_driver->attr;
@@ -673,6 +673,10 @@ err_out_unregister: 
	kobject_unregister(&policy->kobj);

	wait_for_completion(&policy->kobj_unregister);



err_out_driver_exit:

	if (cpufreq_driver->exit)

		cpufreq_driver->exit(policy);



err_out:

	kfree(policy);

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

+2 −2

File changed.

Contains only whitespace changes.