[Xen-changelog] [xen-unstable] ia64: Fix the build after max_cstate changes.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1238587933 -3600
# Node ID 2bbd2c26462d1e9b49adab8ea51b6f587930469d
# Parent  443b3bb740e251413f30843d98e1e0a60f162e50
ia64: Fix the build after max_cstate changes.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/drivers/acpi/pmstat.c    |    4 ++--
 xen/include/asm-x86/config.h |    1 +
 xen/include/xen/acpi.h       |    4 +---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff -r 443b3bb740e2 -r 2bbd2c26462d xen/drivers/acpi/pmstat.c
--- a/xen/drivers/acpi/pmstat.c Wed Apr 01 11:53:15 2009 +0100
+++ b/xen/drivers/acpi/pmstat.c Wed Apr 01 13:12:13 2009 +0100
@@ -530,13 +530,13 @@ int do_pm_op(struct xen_sysctl_pm_op *op
 
     case XEN_SYSCTL_pm_op_get_max_cstate:
     {
-        op->get_max_cstate = max_cstate;
+        op->get_max_cstate = acpi_get_cstate_limit();
         break;
     }
 
     case XEN_SYSCTL_pm_op_set_max_cstate:
     {
-        max_cstate = op->set_max_cstate;
+        acpi_set_cstate_limit(op->set_max_cstate);
         break;
     }
 
diff -r 443b3bb740e2 -r 2bbd2c26462d xen/include/asm-x86/config.h
--- a/xen/include/asm-x86/config.h      Wed Apr 01 11:53:15 2009 +0100
+++ b/xen/include/asm-x86/config.h      Wed Apr 01 13:12:13 2009 +0100
@@ -35,6 +35,7 @@
 #define CONFIG_ACPI_SLEEP 1
 #define CONFIG_ACPI_NUMA 1
 #define CONFIG_ACPI_SRAT 1
+#define CONFIG_ACPI_CSTATE 1
 
 #define CONFIG_VGA 1
 
diff -r 443b3bb740e2 -r 2bbd2c26462d xen/include/xen/acpi.h
--- a/xen/include/xen/acpi.h    Wed Apr 01 11:53:15 2009 +0100
+++ b/xen/include/xen/acpi.h    Wed Apr 01 13:12:13 2009 +0100
@@ -402,9 +402,7 @@ static inline int acpi_blacklisted(void)
 
 #endif /*!CONFIG_ACPI_INTERPRETER*/
 
-#define        ACPI_CSTATE_LIMIT_DEFINED       /* for driver builds */
-#ifdef CONFIG_ACPI
-
+#ifdef CONFIG_ACPI_CSTATE
 /*
  * Set highest legal C-state
  * 0: C0 okay, but not C1

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