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

Commit a0abd520 authored by Rusty Russell's avatar Rusty Russell
Browse files

cpumask: fix powernow-k8: partial revert of 2fdf66b4 



Impact: fix powernow-k8 when acpi=off (or other error).

There was a spurious change introduced into powernow-k8 in this patch:
so that we try to "restore" the cpus_allowed we never saved.  We revert
that file.

See lkml "[PATCH] x86/powernow: fix cpus_allowed brokage when
acpi=off" from Yinghai for the bug report.

Cc: Mike Travis <travis@sgi.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
parent d2f8d7ee

arch/x86/kernel/cpu/cpufreq/powernow-k8.c

+7 −5
Original line number Diff line number Diff line
@@ -1157,8 +1157,7 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol) 
	data->cpu = pol->cpu;

	data->currpstate = HW_PSTATE_INVALID;



	rc = powernow_k8_cpu_init_acpi(data);

	if (rc) {

	if (powernow_k8_cpu_init_acpi(data)) {

		/*

		 * Use the PSB BIOS structure. This is only availabe on

		 * an UP version, and is deprecated by AMD.
@@ -1176,17 +1175,20 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol) 
			       "ACPI maintainers and complain to your BIOS "

			       "vendor.\n");

#endif

			goto err_out;

			kfree(data);

			return -ENODEV;

		}

		if (pol->cpu != 0) {

			printk(KERN_ERR FW_BUG PFX "No ACPI _PSS objects for "

			       "CPU other than CPU0. Complain to your BIOS "

			       "vendor.\n");

			goto err_out;

			kfree(data);

			return -ENODEV;

		}

		rc = find_psb_table(data);

		if (rc) {

			goto err_out;

			kfree(data);

			return -ENODEV;

		}

		/* Take a crude guess here.

		 * That guess was in microseconds, so multiply with 1000 */