summaryrefslogtreecommitdiffstats
path: root/include/xen
diff options
context:
space:
mode:
authorLiu Jinsong <jinsong.liu@intel.com>2013-02-14 15:46:26 +0800
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2013-02-19 22:02:30 -0500
commit268a207563f933ff8e3d876866c324b4247f234e (patch)
tree929fb34d3435c3ffe86d2cbd474bb739091e90e5 /include/xen
parent39adc483d378f79711f291539f20e3797337892d (diff)
downloadblackbird-obmc-linux-268a207563f933ff8e3d876866c324b4247f234e.tar.gz
blackbird-obmc-linux-268a207563f933ff8e3d876866c324b4247f234e.zip
xen/acpi: move xen_acpi_get_pxm under CONFIG_XEN_DOM0
To avoid compile issue and it's meanigfull only under CONFIG_XEN_DOM0. In file included from linux/arch/x86/xen/enlighten.c:47:0: linux/include/xen/acpi.h:75:76: error: unknown type name ‘acpi_handle’ make[3]: *** [arch/x86/xen/enlighten.o] Error 1 Signed-off-by: Liu Jinsong <jinsong.liu@intel.com> [v1: Fixed spelling mistakes] Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'include/xen')
-rw-r--r--include/xen/acpi.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/include/xen/acpi.h b/include/xen/acpi.h
index c962d5f5b38b..68d73d09b770 100644
--- a/include/xen/acpi.h
+++ b/include/xen/acpi.h
@@ -57,21 +57,6 @@ void xen_stub_processor_exit(void);
void xen_pcpu_hotplug_sync(void);
int xen_pcpu_id(uint32_t acpi_id);
-int xen_acpi_notify_hypervisor_state(u8 sleep_state,
- u32 pm1a_cnt, u32 pm1b_cnd);
-
-static inline void xen_acpi_sleep_register(void)
-{
- if (xen_initial_domain())
- acpi_os_set_prepare_sleep(
- &xen_acpi_notify_hypervisor_state);
-}
-#else
-static inline void xen_acpi_sleep_register(void)
-{
-}
-#endif
-
static inline int xen_acpi_get_pxm(acpi_handle h)
{
unsigned long long pxm;
@@ -90,4 +75,19 @@ static inline int xen_acpi_get_pxm(acpi_handle h)
return -ENXIO;
}
+int xen_acpi_notify_hypervisor_state(u8 sleep_state,
+ u32 pm1a_cnt, u32 pm1b_cnd);
+
+static inline void xen_acpi_sleep_register(void)
+{
+ if (xen_initial_domain())
+ acpi_os_set_prepare_sleep(
+ &xen_acpi_notify_hypervisor_state);
+}
+#else
+static inline void xen_acpi_sleep_register(void)
+{
+}
+#endif
+
#endif /* _XEN_ACPI_H */
OpenPOWER on IntegriCloud