From: Jialin Zhang zhangjialin11@huawei.com
hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA
-------------------------------
Reserve space for power management related structure.
Signed-off-by: Jialin Zhang zhangjialin11@huawei.com conflicts: include/linux/pm_domain.h include/linux/pm.h Signed-off-by: Lin Yujun linyujun809@huawei.com --- include/linux/pm.h | 3 +++ include/linux/pm_domain.h | 4 ++++ include/linux/pm_qos.h | 7 +++++++ include/linux/pm_wakeup.h | 4 ++++ 4 files changed, 18 insertions(+)
diff --git a/include/linux/pm.h b/include/linux/pm.h index f80ebfcdee08..6850c76da319 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -757,6 +757,9 @@ struct dev_pm_domain { int (*activate)(struct device *dev); void (*sync)(struct device *dev); void (*dismiss)(struct device *dev); + + KABI_RESERVE(1) + KABI_RESERVE(2) };
/* diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 0928055376bc..4dd9a274f434 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -111,6 +111,10 @@ struct genpd_power_state { struct fwnode_handle *fwnode; u64 idle_time; void *data; + + KABI_RESERVE(1) + KABI_RESERVE(2) + };
struct genpd_lock_ops; diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h index 4a69d4af3ff8..4745e27680df 100644 --- a/include/linux/pm_qos.h +++ b/include/linux/pm_qos.h @@ -15,6 +15,7 @@ #include <linux/plist.h> #include <linux/notifier.h> #include <linux/device.h> +#include <linux/kabi.h>
enum pm_qos_flags_status { PM_QOS_FLAGS_UNDEFINED = -1, @@ -112,6 +113,9 @@ struct dev_pm_qos_request { struct freq_qos_request freq; } data; struct device *dev; + + KABI_RESERVE(1) + KABI_RESERVE(2) };
struct dev_pm_qos { @@ -122,6 +126,9 @@ struct dev_pm_qos { struct dev_pm_qos_request *resume_latency_req; struct dev_pm_qos_request *latency_tolerance_req; struct dev_pm_qos_request *flags_req; + + KABI_RESERVE(1) + KABI_RESERVE(2) };
/* Action requested to pm_qos_update_target */ diff --git a/include/linux/pm_wakeup.h b/include/linux/pm_wakeup.h index 6eb9adaef52b..27728bec3072 100644 --- a/include/linux/pm_wakeup.h +++ b/include/linux/pm_wakeup.h @@ -14,6 +14,7 @@ #endif
#include <linux/types.h> +#include <linux/kabi.h>
struct wake_irq;
@@ -61,6 +62,9 @@ struct wakeup_source { struct device *dev; bool active:1; bool autosleep_enabled:1; + + KABI_RESERVE(1) + KABI_RESERVE(2) };
#define for_each_wakeup_source(ws) \