ia64/linux-2.6.18-xen.hg

changeset 669:de4d39818577

x86, xen, pm: Update domain shared type and hotplug parameter defination

Signed-off-by: Liu, Jinsong <jinsong.liu@intel.com>
author Keir Fraser <keir.fraser@citrix.com>
date Fri Sep 12 10:37:32 2008 +0100 (2008-09-12)
parents 92a5f8917514
children 0ba49e9e74f9
files arch/i386/kernel/acpi/processor_extcntl_xen.c include/acpi/processor.h
line diff
     1.1 --- a/arch/i386/kernel/acpi/processor_extcntl_xen.c	Fri Sep 12 10:37:02 2008 +0100
     1.2 +++ b/arch/i386/kernel/acpi/processor_extcntl_xen.c	Fri Sep 12 10:37:32 2008 +0100
     1.3 @@ -193,15 +193,17 @@ static int xen_px_notifier(struct acpi_p
     1.4  		/* psd */
     1.5  		pdomain = &px->domain_info;
     1.6  		convert_psd_pack(&perf->domain_info, pdomain);
     1.7 -		if (perf->domain_info.num_processors) {
     1.8 -			if (pdomain->coord_type == DOMAIN_COORD_TYPE_SW_ALL)
     1.9 -				perf->shared_type = CPUFREQ_SHARED_TYPE_ALL;
    1.10 -			else if (pdomain->coord_type == DOMAIN_COORD_TYPE_SW_ANY)
    1.11 -				perf->shared_type = CPUFREQ_SHARED_TYPE_ANY;
    1.12 -			else if (pdomain->coord_type == DOMAIN_COORD_TYPE_HW_ALL)
    1.13 -				perf->shared_type = CPUFREQ_SHARED_TYPE_HW;
    1.14 -		} else
    1.15 -			perf->shared_type = CPUFREQ_SHARED_TYPE_NONE;
    1.16 +		if (pdomain->coord_type == DOMAIN_COORD_TYPE_SW_ALL)
    1.17 +			perf->shared_type = CPUFREQ_SHARED_TYPE_ALL;
    1.18 +		else if (pdomain->coord_type == DOMAIN_COORD_TYPE_SW_ANY)
    1.19 +			perf->shared_type = CPUFREQ_SHARED_TYPE_ANY;
    1.20 +		else if (pdomain->coord_type == DOMAIN_COORD_TYPE_HW_ALL)
    1.21 +			perf->shared_type = CPUFREQ_SHARED_TYPE_HW;
    1.22 +		else {
    1.23 +			ret = -ENODEV;
    1.24 +			kfree(states);
    1.25 +			break;
    1.26 +		}
    1.27  
    1.28  		ret = HYPERVISOR_platform_op(&op);
    1.29  		kfree(states);
     2.1 --- a/include/acpi/processor.h	Fri Sep 12 10:37:02 2008 +0100
     2.2 +++ b/include/acpi/processor.h	Fri Sep 12 10:37:32 2008 +0100
     2.3 @@ -371,7 +371,7 @@ struct processor_extcntl_ops {
     2.4  	/* Transfer processor PM events to external control logic */
     2.5  	int (*pm_ops[PM_TYPE_MAX])(struct acpi_processor *pr, int event);
     2.6  	/* Notify physical processor status to external control logic */
     2.7 -	int (*hotplug)(struct acpi_processor *pr, int event);
     2.8 +	int (*hotplug)(struct acpi_processor *pr, int type);
     2.9  };
    2.10  extern const struct processor_extcntl_ops *processor_extcntl_ops;
    2.11