ia64/linux-2.6.18-xen.hg

changeset 637:59912a8aee53

linux/acpi: more extcntl code adjustments

Restore a preprocessor conditional for native to remain unaltered.

Add necessary definitions for being able to build with
CONFIG_ACPI_DEBUG.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
author Keir Fraser <keir.fraser@citrix.com>
date Fri Aug 08 14:20:34 2008 +0100 (2008-08-08)
parents 2807d531d025
children 099864f50909
files drivers/acpi/processor_core.c drivers/acpi/processor_extcntl.c
line diff
     1.1 --- a/drivers/acpi/processor_core.c	Fri Aug 08 12:43:57 2008 +0100
     1.2 +++ b/drivers/acpi/processor_core.c	Fri Aug 08 14:20:34 2008 +0100
     1.3 @@ -509,7 +509,9 @@ static int acpi_processor_get_info(struc
     1.4  		request_region(pr->throttling.address, 6, "ACPI CPU throttle");
     1.5  	}
     1.6  
     1.7 +#if defined(CONFIG_CPU_FREQ) || defined(CONFIG_PROCESSOR_EXTERNAL_CONTROL)
     1.8  	acpi_processor_ppc_has_changed(pr);
     1.9 +#endif
    1.10  	acpi_processor_get_throttling_info(pr);
    1.11  	acpi_processor_get_limit_info(pr);
    1.12  
     2.1 --- a/drivers/acpi/processor_extcntl.c	Fri Aug 08 12:43:57 2008 +0100
     2.2 +++ b/drivers/acpi/processor_extcntl.c	Fri Aug 08 14:20:34 2008 +0100
     2.3 @@ -30,6 +30,12 @@
     2.4  
     2.5  #include <acpi/processor.h>
     2.6  
     2.7 +#define ACPI_PROCESSOR_COMPONENT        0x01000000
     2.8 +#define ACPI_PROCESSOR_CLASS            "processor"
     2.9 +#define ACPI_PROCESSOR_DRIVER_NAME      "ACPI Processor Driver"
    2.10 +#define _COMPONENT              ACPI_PROCESSOR_COMPONENT
    2.11 +ACPI_MODULE_NAME("acpi_processor")
    2.12 +
    2.13  static int processor_extcntl_parse_csd(struct acpi_processor *pr);
    2.14  static int processor_extcntl_get_performance(struct acpi_processor *pr);
    2.15  /*