[Xen-changelog] [linux-2.6.18-xen] linux: small ACPI processor external control code adjustments

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1268814772 0
# Node ID 51e42fb1758cb8e7efaa8ec6788f15947039b4ef
# Parent  13e25228ce4041c947f078e42f23cdaf58f02eba
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 <jbeulich@xxxxxxxxxx>
---
 arch/i386/kernel/acpi/processor_extcntl_xen.c |    2 ++
 drivers/acpi/processor_perflib.c              |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff -r 13e25228ce40 -r 51e42fb1758c 
arch/i386/kernel/acpi/processor_extcntl_xen.c
--- a/arch/i386/kernel/acpi/processor_extcntl_xen.c     Mon Mar 15 17:05:28 
2010 +0000
+++ b/arch/i386/kernel/acpi/processor_extcntl_xen.c     Wed Mar 17 08:32:52 
2010 +0000
@@ -117,6 +117,8 @@ static int xen_px_notifier(struct acpi_p
 
        perf = &op.u.set_pminfo.u.perf;
        px = pr->performance;
+       if (!px)
+               return -EINVAL;
 
        switch(action) {
        case PROCESSOR_PM_CHANGE:
diff -r 13e25228ce40 -r 51e42fb1758c drivers/acpi/processor_perflib.c
--- a/drivers/acpi/processor_perflib.c  Mon Mar 15 17:05:28 2010 +0000
+++ b/drivers/acpi/processor_perflib.c  Wed Mar 17 08:32:52 2010 +0000
@@ -141,7 +141,7 @@ int acpi_processor_ppc_has_changed(struc
        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

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog