Ian Campbell
2009-Dec-03 22:03 UTC
[Xen-devel] [PATCH] xen: allow CONFIG_ACPI_PROCESSOR_XEN=m
From: Ian Campbell <ijc@hellion.org.uk>
This appears to work fine now.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Yu Ke <ke.yu@intel.com>
---
drivers/xen/Kconfig | 2 +-
include/xen/acpi.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index fc2001c..f03f73e 100644
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -169,7 +169,7 @@ config XEN_MCE
depends on XEN_DOM0 && X86_64 && X86_MCE_INTEL
config ACPI_PROCESSOR_XEN
- bool
+ tristate
depends on XEN_DOM0 && ACPI_PROCESSOR && CPU_FREQ
default y
diff --git a/include/xen/acpi.h b/include/xen/acpi.h
index 3d7ea40..8506688 100644
--- a/include/xen/acpi.h
+++ b/include/xen/acpi.h
@@ -41,7 +41,7 @@ int acpi_notify_hypervisor_state(u8 sleep_state,
#define HOTPLUG_TYPE_ADD 0
#define HOTPLUG_TYPE_REMOVE 1
-#ifdef CONFIG_ACPI_PROCESSOR_XEN
+#if defined(CONFIG_ACPI_PROCESSOR_XEN) ||
defined(CONFIG_ACPI_PROCESSOR_XEN_MODULE)
struct processor_cntl_xen_ops {
/* Transfer processor PM events to xen */
--
1.6.5.3
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
Jeremy Fitzhardinge
2009-Dec-03 22:41 UTC
Re: [Xen-devel] [PATCH] xen: allow CONFIG_ACPI_PROCESSOR_XEN=m
On 12/03/09 14:03, Ian Campbell wrote:> diff --git a/include/xen/acpi.h b/include/xen/acpi.h > index 3d7ea40..8506688 100644 > --- a/include/xen/acpi.h > +++ b/include/xen/acpi.h > @@ -41,7 +41,7 @@ int acpi_notify_hypervisor_state(u8 sleep_state, > #define HOTPLUG_TYPE_ADD 0 > #define HOTPLUG_TYPE_REMOVE 1 > > -#ifdef CONFIG_ACPI_PROCESSOR_XEN > +#if defined(CONFIG_ACPI_PROCESSOR_XEN) || defined(CONFIG_ACPI_PROCESSOR_XEN_MODULE) >Is this necessary? I thought =m defined CONFIG_ACPI_PROCESSOR_XE. J> > struct processor_cntl_xen_ops { > /* Transfer processor PM events to xen */ >_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Ian Campbell
2009-Dec-03 22:46 UTC
Re: [Xen-devel] [PATCH] xen: allow CONFIG_ACPI_PROCESSOR_XEN=m
On Thu, 2009-12-03 at 22:41 +0000, Jeremy Fitzhardinge wrote:> On 12/03/09 14:03, Ian Campbell wrote: > > diff --git a/include/xen/acpi.h b/include/xen/acpi.h > > index 3d7ea40..8506688 100644 > > --- a/include/xen/acpi.h > > +++ b/include/xen/acpi.h > > @@ -41,7 +41,7 @@ int acpi_notify_hypervisor_state(u8 sleep_state, > > #define HOTPLUG_TYPE_ADD 0 > > #define HOTPLUG_TYPE_REMOVE 1 > > > > -#ifdef CONFIG_ACPI_PROCESSOR_XEN > > +#if defined(CONFIG_ACPI_PROCESSOR_XEN) || defined(CONFIG_ACPI_PROCESSOR_XEN_MODULE) > > > > Is this necessary? I thought =m defined CONFIG_ACPI_PROCESSOR_XE.I thought so too but I got a build error without this change: CC [M] drivers/xen/acpi_processor.o drivers/xen/acpi_processor.c:41: error: variable ‘xen_ops’ has initializer but incomplete type drivers/xen/acpi_processor.c:42: error: unknown field ‘hotplug’ specified in initializer drivers/xen/acpi_processor.c:42: warning: excess elements in struct initializer drivers/xen/acpi_processor.c:42: warning: (near initialization for ‘xen_ops’) drivers/xen/acpi_processor.c:47: error: redefinition of ‘processor_cntl_xen_power_cache’ include/xen/acpi.h:74: error: previous definition of ‘processor_cntl_xen_power_cache’ was here drivers/xen/acpi_processor.c:72: error: redefinition of ‘processor_cntl_xen’ include/xen/acpi.h:63: error: previous definition of ‘processor_cntl_xen’ was here drivers/xen/acpi_processor.c:78: error: redefinition of ‘processor_cntl_xen_pm’ include/xen/acpi.h:64: error: previous definition of ‘processor_cntl_xen_pm’ was here drivers/xen/acpi_processor.c: In function ‘processor_cntl_xen_pm’: drivers/xen/acpi_processor.c:80: error: invalid use of undefined type ‘struct processor_cntl_xen_ops’ drivers/xen/acpi_processor.c: At top level: drivers/xen/acpi_processor.c:84: error: redefinition of ‘processor_cntl_xen_pmperf’ include/xen/acpi.h:65: error: previous definition of ‘processor_cntl_xen_pmperf’ was here drivers/xen/acpi_processor.c: In function ‘processor_cntl_xen_pmperf’: drivers/xen/acpi_processor.c:86: error: invalid use of undefined type ‘struct processor_cntl_xen_ops’ drivers/xen/acpi_processor.c: At top level: drivers/xen/acpi_processor.c:90: error: redefinition of ‘processor_cntl_xen_pmthr’ include/xen/acpi.h:66: error: previous definition of ‘processor_cntl_xen_pmthr’ was here drivers/xen/acpi_processor.c: In function ‘processor_cntl_xen_pmthr’: drivers/xen/acpi_processor.c:92: error: invalid use of undefined type ‘struct processor_cntl_xen_ops’ drivers/xen/acpi_processor.c: At top level: drivers/xen/acpi_processor.c:96: error: redefinition of ‘processor_cntl_xen_notify’ include/xen/acpi.h:69: error: previous definition of ‘processor_cntl_xen_notify’ was here drivers/xen/acpi_processor.c: In function ‘processor_cntl_xen_notify’: drivers/xen/acpi_processor.c:104: error: invalid use of undefined type ‘struct processor_cntl_xen_ops’ drivers/xen/acpi_processor.c:107: error: invalid use of undefined type ‘struct processor_cntl_xen_ops’ drivers/xen/acpi_processor.c:110: error: invalid use of undefined type ‘struct processor_cntl_xen_ops’ drivers/xen/acpi_processor.c:111: error: invalid use of undefined type ‘struct processor_cntl_xen_ops’ drivers/xen/acpi_processor.c: In function ‘xen_acpi_processor_extcntl_init’: drivers/xen/acpi_processor.c:327: error: invalid use of undefined type ‘struct processor_cntl_xen_ops’ drivers/xen/acpi_processor.c:329: error: invalid use of undefined type ‘struct processor_cntl_xen_ops’ drivers/xen/acpi_processor.c:331: error: invalid use of undefined type ‘struct processor_cntl_xen_ops’ make[2]: *** [drivers/xen/acpi_processor.o] Error 1 make[1]: *** [drivers/xen/] Error 2 make: *** [sub-make] Error 2 Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel