diff options
author | Liu Jinsong <jinsong.liu@intel.com> | 2013-02-14 02:46:26 -0500 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2013-02-19 22:02:30 -0500 |
commit | 268a207563f933ff8e3d876866c324b4247f234e (patch) | |
tree | 929fb34d3435c3ffe86d2cbd474bb739091e90e5 /include | |
parent | 39adc483d378f79711f291539f20e3797337892d (diff) |
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')
-rw-r--r-- | include/xen/acpi.h | 30 |
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); | |||
57 | void xen_pcpu_hotplug_sync(void); | 57 | void xen_pcpu_hotplug_sync(void); |
58 | int xen_pcpu_id(uint32_t acpi_id); | 58 | int xen_pcpu_id(uint32_t acpi_id); |
59 | 59 | ||
60 | int xen_acpi_notify_hypervisor_state(u8 sleep_state, | ||
61 | u32 pm1a_cnt, u32 pm1b_cnd); | ||
62 | |||
63 | static inline void xen_acpi_sleep_register(void) | ||
64 | { | ||
65 | if (xen_initial_domain()) | ||
66 | acpi_os_set_prepare_sleep( | ||
67 | &xen_acpi_notify_hypervisor_state); | ||
68 | } | ||
69 | #else | ||
70 | static inline void xen_acpi_sleep_register(void) | ||
71 | { | ||
72 | } | ||
73 | #endif | ||
74 | |||
75 | static inline int xen_acpi_get_pxm(acpi_handle h) | 60 | static inline int xen_acpi_get_pxm(acpi_handle h) |
76 | { | 61 | { |
77 | unsigned long long pxm; | 62 | unsigned long long pxm; |
@@ -90,4 +75,19 @@ static inline int xen_acpi_get_pxm(acpi_handle h) | |||
90 | return -ENXIO; | 75 | return -ENXIO; |
91 | } | 76 | } |
92 | 77 | ||
78 | int xen_acpi_notify_hypervisor_state(u8 sleep_state, | ||
79 | u32 pm1a_cnt, u32 pm1b_cnd); | ||
80 | |||
81 | static inline void xen_acpi_sleep_register(void) | ||
82 | { | ||
83 | if (xen_initial_domain()) | ||
84 | acpi_os_set_prepare_sleep( | ||
85 | &xen_acpi_notify_hypervisor_state); | ||
86 | } | ||
87 | #else | ||
88 | static inline void xen_acpi_sleep_register(void) | ||
89 | { | ||
90 | } | ||
91 | #endif | ||
92 | |||
93 | #endif /* _XEN_ACPI_H */ | 93 | #endif /* _XEN_ACPI_H */ |