diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2009-04-01 13:12:13 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2009-04-01 13:12:13 +0100 |
| commit | fed6ed29b093cc6c717fefb1aad192f45bbb4149 (patch) | |
| tree | 125a424a054075638ffa9ef38e09b5ad4134aa6d | |
| parent | 3a8690df4ac44731476b9d9f0aa30470bce3d66c (diff) | |
| download | xen-fed6ed29b093cc6c717fefb1aad192f45bbb4149.tar.gz xen-fed6ed29b093cc6c717fefb1aad192f45bbb4149.tar.bz2 xen-fed6ed29b093cc6c717fefb1aad192f45bbb4149.zip | |
ia64: Fix the build after max_cstate changes.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
| -rw-r--r-- | xen/drivers/acpi/pmstat.c | 4 | ||||
| -rw-r--r-- | xen/include/asm-x86/config.h | 1 | ||||
| -rw-r--r-- | xen/include/xen/acpi.h | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c index 8125e88951..33954307d7 100644 --- a/xen/drivers/acpi/pmstat.c +++ b/xen/drivers/acpi/pmstat.c @@ -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 --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 9d140ef891..3e05dbf0bb 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -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 --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h index cbf795aeaf..43bdade6c4 100644 --- a/xen/include/xen/acpi.h +++ b/xen/include/xen/acpi.h @@ -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 |