| Message ID | 20230816204143.66281-3-mario.limonciello@amd.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Fix wakeup problems on some AMD platforms | expand |
On 8/16/2023 1:41 PM, Mario Limonciello wrote: > The #ifdef currently is guarded against CONFIG_X86, but these are > actually sleep related functions so they should be tied to > CONFIG_SUSPEND. Explain why #ifdef and functions you are talking about clearly in the commit log? > > Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> > --- > v11->v12: > * change to CONFIG_SUSPEND > v9->v10: > * split from other patches > --- > include/linux/acpi.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/linux/acpi.h b/include/linux/acpi.h > index 0d5277b7c6323..f1552c04a2856 100644 > --- a/include/linux/acpi.h > +++ b/include/linux/acpi.h > @@ -1100,7 +1100,7 @@ void acpi_os_set_prepare_extended_sleep(int (*func)(u8 sleep_state, > > acpi_status acpi_os_prepare_extended_sleep(u8 sleep_state, > u32 val_a, u32 val_b); > -#ifdef CONFIG_X86 > +#if defined(CONFIG_SUSPEND) && defined(CONFIG_X86) > struct acpi_s2idle_dev_ops { > struct list_head list_node; > void (*prepare)(void); > @@ -1109,7 +1109,7 @@ struct acpi_s2idle_dev_ops { > }; > int acpi_register_lps0_dev(struct acpi_s2idle_dev_ops *arg); > void acpi_unregister_lps0_dev(struct acpi_s2idle_dev_ops *arg); > -#endif /* CONFIG_X86 */ > +#endif /* CONFIG_SUSPEND && CONFIG_X86 */ > #ifndef CONFIG_IA64 > void arch_reserve_mem_area(acpi_physical_address addr, size_t size); > #else
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 0d5277b7c6323..f1552c04a2856 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -1100,7 +1100,7 @@ void acpi_os_set_prepare_extended_sleep(int (*func)(u8 sleep_state, acpi_status acpi_os_prepare_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b); -#ifdef CONFIG_X86 +#if defined(CONFIG_SUSPEND) && defined(CONFIG_X86) struct acpi_s2idle_dev_ops { struct list_head list_node; void (*prepare)(void); @@ -1109,7 +1109,7 @@ struct acpi_s2idle_dev_ops { }; int acpi_register_lps0_dev(struct acpi_s2idle_dev_ops *arg); void acpi_unregister_lps0_dev(struct acpi_s2idle_dev_ops *arg); -#endif /* CONFIG_X86 */ +#endif /* CONFIG_SUSPEND && CONFIG_X86 */ #ifndef CONFIG_IA64 void arch_reserve_mem_area(acpi_physical_address addr, size_t size); #else
The #ifdef currently is guarded against CONFIG_X86, but these are actually sleep related functions so they should be tied to CONFIG_SUSPEND. Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> --- v11->v12: * change to CONFIG_SUSPEND v9->v10: * split from other patches --- include/linux/acpi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)