ia64/linux-2.6.18-xen.hg

changeset 714:de7f94bd650b

dom0: Fix for throttling while pr->id == -1

Signed-off-by: Wei Gang <gang.wei@intel.com>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Oct 28 10:39:11 2008 +0000 (2008-10-28)
parents f40f4f86d5a2
children a71e987e15fc
files drivers/acpi/processor_core.c
line diff
     1.1 --- a/drivers/acpi/processor_core.c	Mon Oct 27 13:47:07 2008 +0000
     1.2 +++ b/drivers/acpi/processor_core.c	Tue Oct 28 10:39:11 2008 +0000
     1.3 @@ -513,8 +513,17 @@ static int acpi_processor_get_info(struc
     1.4  #if defined(CONFIG_CPU_FREQ) || defined(CONFIG_PROCESSOR_EXTERNAL_CONTROL)
     1.5  	acpi_processor_ppc_has_changed(pr);
     1.6  #endif
     1.7 -	acpi_processor_get_throttling_info(pr);
     1.8 -	acpi_processor_get_limit_info(pr);
     1.9 +
    1.10 +	/* 
    1.11 +	 * pr->id may equal to -1 while processor_cntl_external enabled.
    1.12 +	 * throttle and thermal module don't support this case.
    1.13 +	 * Tx only works when dom0 vcpu == pcpu num by far, as we give 
    1.14 +	 * control to dom0.
    1.15 +	 */
    1.16 +	if (pr->id != -1) {
    1.17 +		acpi_processor_get_throttling_info(pr);
    1.18 +		acpi_processor_get_limit_info(pr);
    1.19 +	}
    1.20  
    1.21  	return 0;
    1.22  }