ia64/xen-unstable

changeset 19490:2bbd2c26462d

ia64: Fix the build after max_cstate changes.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Wed Apr 01 13:12:13 2009 +0100 (2009-04-01)
parents 443b3bb740e2
children 01873414cfc1
files xen/drivers/acpi/pmstat.c xen/include/asm-x86/config.h xen/include/xen/acpi.h
line diff
     1.1 --- a/xen/drivers/acpi/pmstat.c	Wed Apr 01 11:53:15 2009 +0100
     1.2 +++ b/xen/drivers/acpi/pmstat.c	Wed Apr 01 13:12:13 2009 +0100
     1.3 @@ -530,13 +530,13 @@ int do_pm_op(struct xen_sysctl_pm_op *op
     1.4  
     1.5      case XEN_SYSCTL_pm_op_get_max_cstate:
     1.6      {
     1.7 -        op->get_max_cstate = max_cstate;
     1.8 +        op->get_max_cstate = acpi_get_cstate_limit();
     1.9          break;
    1.10      }
    1.11  
    1.12      case XEN_SYSCTL_pm_op_set_max_cstate:
    1.13      {
    1.14 -        max_cstate = op->set_max_cstate;
    1.15 +        acpi_set_cstate_limit(op->set_max_cstate);
    1.16          break;
    1.17      }
    1.18  
     2.1 --- a/xen/include/asm-x86/config.h	Wed Apr 01 11:53:15 2009 +0100
     2.2 +++ b/xen/include/asm-x86/config.h	Wed Apr 01 13:12:13 2009 +0100
     2.3 @@ -35,6 +35,7 @@
     2.4  #define CONFIG_ACPI_SLEEP 1
     2.5  #define CONFIG_ACPI_NUMA 1
     2.6  #define CONFIG_ACPI_SRAT 1
     2.7 +#define CONFIG_ACPI_CSTATE 1
     2.8  
     2.9  #define CONFIG_VGA 1
    2.10  
     3.1 --- a/xen/include/xen/acpi.h	Wed Apr 01 11:53:15 2009 +0100
     3.2 +++ b/xen/include/xen/acpi.h	Wed Apr 01 13:12:13 2009 +0100
     3.3 @@ -402,9 +402,7 @@ static inline int acpi_blacklisted(void)
     3.4  
     3.5  #endif /*!CONFIG_ACPI_INTERPRETER*/
     3.6  
     3.7 -#define	ACPI_CSTATE_LIMIT_DEFINED	/* for driver builds */
     3.8 -#ifdef	CONFIG_ACPI
     3.9 -
    3.10 +#ifdef	CONFIG_ACPI_CSTATE
    3.11  /*
    3.12   * Set highest legal C-state
    3.13   * 0: C0 okay, but not C1