Offering: HULK hulk inclusion category: bugfix bugzilla: https://atomgit.com/src-openeuler/kernel/issues/14259 -------------------------------- Fixes: 639757536abe ("driver core: generalize driver_override in struct device") Fixes: e5181adaa2f2 ("driver core: platform: use generic driver_override infrastructure") Signed-off-by: Lin Ruifeng <linruifeng4@huawei.com> --- include/linux/device.h | 11 +++++++---- include/linux/device/bus.h | 3 +-- include/linux/platform_device.h | 2 ++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/linux/device.h b/include/linux/device.h index 37b027482e6f..1f66d20d36c9 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -725,10 +725,6 @@ struct device { core doesn't touch it */ void *driver_data; /* Driver data, set and get with dev_set_drvdata/dev_get_drvdata */ - struct { - const char *name; - spinlock_t lock; - } driver_override; struct mutex mutex; /* mutex to synchronize calls to * its driver. */ @@ -837,8 +833,15 @@ struct device { #else KABI_RESERVE(4) #endif +#ifndef __GENKSYMS__ + struct { + const char *name; + spinlock_t lock; + } driver_override; +#else KABI_RESERVE(5) KABI_RESERVE(6) +#endif KABI_RESERVE(7) KABI_RESERVE(8) }; diff --git a/include/linux/device/bus.h b/include/linux/device/bus.h index c6fa913fd1e9..a00048fc532c 100644 --- a/include/linux/device/bus.h +++ b/include/linux/device/bus.h @@ -104,10 +104,9 @@ struct bus_type { const struct dev_pm_ops *pm; - bool driver_override; bool need_parent_lock; - KABI_RESERVE(1) + KABI_USE(1, bool driver_override) KABI_RESERVE(2) KABI_RESERVE(3) KABI_RESERVE(4) diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h index 8828b0d275d7..f327e6cf53bd 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h @@ -32,6 +32,8 @@ struct platform_device { const struct platform_device_id *id_entry; + KABI_DEPRECATE(const char *, driver_override) + /* MFD cell pointer */ struct mfd_cell *mfd_cell; -- 2.43.0