[Xen-changelog] [linux-2.6.18-xen] x86, xen, pm: Update domain shared type and hotplug parameter defination

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1221212252 -3600
# Node ID de4d39818577c14de7f687ae3eed5745cc903d10
# Parent  92a5f89175145e78fd2de6cfae863b8bb286b942
x86, xen, pm: Update domain shared type and hotplug parameter defination

Signed-off-by: Liu, Jinsong <jinsong.liu@xxxxxxxxx>
---
 arch/i386/kernel/acpi/processor_extcntl_xen.c |   20 +++++++++++---------
 include/acpi/processor.h                      |    2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff -r 92a5f8917514 -r de4d39818577 
arch/i386/kernel/acpi/processor_extcntl_xen.c
--- a/arch/i386/kernel/acpi/processor_extcntl_xen.c     Fri Sep 12 10:37:02 
2008 +0100
+++ b/arch/i386/kernel/acpi/processor_extcntl_xen.c     Fri Sep 12 10:37:32 
2008 +0100
@@ -193,15 +193,17 @@ static int xen_px_notifier(struct acpi_p
                /* psd */
                pdomain = &px->domain_info;
                convert_psd_pack(&perf->domain_info, pdomain);
-               if (perf->domain_info.num_processors) {
-                       if (pdomain->coord_type == DOMAIN_COORD_TYPE_SW_ALL)
-                               perf->shared_type = CPUFREQ_SHARED_TYPE_ALL;
-                       else if (pdomain->coord_type == 
DOMAIN_COORD_TYPE_SW_ANY)
-                               perf->shared_type = CPUFREQ_SHARED_TYPE_ANY;
-                       else if (pdomain->coord_type == 
DOMAIN_COORD_TYPE_HW_ALL)
-                               perf->shared_type = CPUFREQ_SHARED_TYPE_HW;
-               } else
-                       perf->shared_type = CPUFREQ_SHARED_TYPE_NONE;
+               if (pdomain->coord_type == DOMAIN_COORD_TYPE_SW_ALL)
+                       perf->shared_type = CPUFREQ_SHARED_TYPE_ALL;
+               else if (pdomain->coord_type == DOMAIN_COORD_TYPE_SW_ANY)
+                       perf->shared_type = CPUFREQ_SHARED_TYPE_ANY;
+               else if (pdomain->coord_type == DOMAIN_COORD_TYPE_HW_ALL)
+                       perf->shared_type = CPUFREQ_SHARED_TYPE_HW;
+               else {
+                       ret = -ENODEV;
+                       kfree(states);
+                       break;
+               }
 
                ret = HYPERVISOR_platform_op(&op);
                kfree(states);
diff -r 92a5f8917514 -r de4d39818577 include/acpi/processor.h
--- a/include/acpi/processor.h  Fri Sep 12 10:37:02 2008 +0100
+++ b/include/acpi/processor.h  Fri Sep 12 10:37:32 2008 +0100
@@ -371,7 +371,7 @@ struct processor_extcntl_ops {
        /* Transfer processor PM events to external control logic */
        int (*pm_ops[PM_TYPE_MAX])(struct acpi_processor *pr, int event);
        /* Notify physical processor status to external control logic */
-       int (*hotplug)(struct acpi_processor *pr, int event);
+       int (*hotplug)(struct acpi_processor *pr, int type);
 };
 extern const struct processor_extcntl_ops *processor_extcntl_ops;
 

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