xen/acpi: move xen_acpi_get_pxm under CONFIG_XEN_DOM0 (268a2075) · Commits · 戴 / test

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>

include/xen/acpi.h

+15 −15

Original line number	Diff line number	Diff line
		@@ -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 */

Admin message