diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-04-11 20:07:30 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-04-11 20:07:30 +0200 |
| commit | 51373c5084e0a828286050634a786c0c0aa958d4 (patch) | |
| tree | fd9f1ace108cb491569ae37a29b6dff101e817c5 /include | |
| parent | aca1a5287ea328fd1f7e2bfa6806646486d86a70 (diff) | |
| parent | cc85f9c05bba23eb525497b42ac5b74801ccbd87 (diff) | |
| download | linux-stable-51373c5084e0a828286050634a786c0c0aa958d4.tar.gz linux-stable-51373c5084e0a828286050634a786c0c0aa958d4.tar.bz2 linux-stable-51373c5084e0a828286050634a786c0c0aa958d4.zip | |
Merge back earlier ACPI bus changes for 6.10.
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acpi_bus.h | 8 | ||||
| -rw-r--r-- | include/linux/acpi.h | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index e7796f373d0d..e3cbf92da370 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -170,7 +170,6 @@ struct acpi_driver { unsigned int flags; struct acpi_device_ops ops; struct device_driver drv; - struct module *owner; }; /* @@ -656,7 +655,12 @@ void acpi_scan_lock_release(void); void acpi_lock_hp_context(void); void acpi_unlock_hp_context(void); int acpi_scan_add_handler(struct acpi_scan_handler *handler); -int acpi_bus_register_driver(struct acpi_driver *driver); +/* + * use a macro to avoid include chaining to get THIS_MODULE + */ +#define acpi_bus_register_driver(drv) \ + __acpi_bus_register_driver(drv, THIS_MODULE) +int __acpi_bus_register_driver(struct acpi_driver *driver, struct module *owner); void acpi_bus_unregister_driver(struct acpi_driver *driver); int acpi_bus_scan(acpi_handle handle); void acpi_bus_trim(struct acpi_device *start); diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 34829f2c517a..168201e4c782 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -573,9 +573,13 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context); #define OSC_SB_CPCV2_SUPPORT 0x00000040 #define OSC_SB_PCLPI_SUPPORT 0x00000080 #define OSC_SB_OSLPI_SUPPORT 0x00000100 +#define OSC_SB_FAST_THERMAL_SAMPLING_SUPPORT 0x00000200 +#define OSC_SB_OVER_16_PSTATES_SUPPORT 0x00000400 +#define OSC_SB_GED_SUPPORT 0x00000800 #define OSC_SB_CPC_DIVERSE_HIGH_SUPPORT 0x00001000 -#define OSC_SB_GENERIC_INITIATOR_SUPPORT 0x00002000 +#define OSC_SB_IRQ_RESOURCE_SOURCE_SUPPORT 0x00002000 #define OSC_SB_CPC_FLEXIBLE_ADR_SPACE 0x00004000 +#define OSC_SB_GENERIC_INITIATOR_SUPPORT 0x00020000 #define OSC_SB_NATIVE_USB4_SUPPORT 0x00040000 #define OSC_SB_PRM_SUPPORT 0x00200000 #define OSC_SB_FFH_OPR_SUPPORT 0x00400000 |