From 1cc1c8260502b6831193a654dbc8721c386bbaea Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 17 Mar 2010 08:32:52 +0000 Subject: [PATCH] linux: small ACPI processor external control code adjustments - don't send a change notification to Xen before having sent an init one - fix a bogus preprocessor directive Signed-off-by: Jan Beulich --- arch/i386/kernel/acpi/processor_extcntl_xen.c | 2 ++ drivers/acpi/processor_perflib.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/i386/kernel/acpi/processor_extcntl_xen.c b/arch/i386/kernel/acpi/processor_extcntl_xen.c index 752b1e02..eb6a53e9 100644 --- a/arch/i386/kernel/acpi/processor_extcntl_xen.c +++ b/arch/i386/kernel/acpi/processor_extcntl_xen.c @@ -117,6 +117,8 @@ static int xen_px_notifier(struct acpi_processor *pr, int action) perf = &op.u.set_pminfo.u.perf; px = pr->performance; + if (!px) + return -EINVAL; switch(action) { case PROCESSOR_PM_CHANGE: diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c index 64160bdf..aae0d887 100644 --- a/drivers/acpi/processor_perflib.c +++ b/drivers/acpi/processor_perflib.c @@ -141,7 +141,7 @@ int acpi_processor_ppc_has_changed(struct acpi_processor *pr) else #ifdef CONFIG_CPU_FREQ return cpufreq_update_policy(pr->id); -#elif CONFIG_PROCESSOR_EXTERNAL_CONTROL +#elif defined(CONFIG_PROCESSOR_EXTERNAL_CONTROL) return processor_notify_external(pr, PROCESSOR_PM_CHANGE, PM_TYPE_PERF); #endif -- 2.39.5