From: Greg Kroah-Hartman gregkh@linuxfoundation.org
mainline inclusion from mainline-v5.11-rc1 commit 7bbb79ff5f7499e0c5d65987458410e8099207d8 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I4O662 CVE: NA
-------------------------------------------------
No need to include slab.h in include/linux/auxiliary_bus.h, as it is not needed there. Move it to drivers/base/auxiliary.c instead.
Cc: Dan Williams dan.j.williams@intel.com Cc: Dave Ertman david.m.ertman@intel.com Cc: Fred Oh fred.oh@linux.intel.com Cc: Kiran Patil kiran.patil@intel.com Cc: Leon Romanovsky leonro@nvidia.com Cc: Martin Habets mhabets@solarflare.com Cc: Parav Pandit parav@mellanox.com Cc: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com Cc: Ranjani Sridharan ranjani.sridharan@linux.intel.com Cc: Shiraz Saleem shiraz.saleem@intel.com Link: https://lore.kernel.org/r/X8og8xi3WkoYXet9@kroah.com Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org Signed-off-by: Yuanzheng Song songyuanzheng@huawei.com Reviewed-by: Kefeng Wangwangkefeng.wang@huawei.com Reviewed-by: Hanjun Guo guohanjun@huawei.com Signed-off-by: Zheng Zengkai zhengzengkai@huawei.com --- drivers/base/auxiliary.c | 1 + include/linux/auxiliary_bus.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/base/auxiliary.c b/drivers/base/auxiliary.c index ef2af417438b..eca36d6284d0 100644 --- a/drivers/base/auxiliary.c +++ b/drivers/base/auxiliary.c @@ -9,6 +9,7 @@
#include <linux/device.h> #include <linux/init.h> +#include <linux/slab.h> #include <linux/module.h> #include <linux/pm_domain.h> #include <linux/pm_runtime.h> diff --git a/include/linux/auxiliary_bus.h b/include/linux/auxiliary_bus.h index 282fbf7bf9af..3580743d0e8d 100644 --- a/include/linux/auxiliary_bus.h +++ b/include/linux/auxiliary_bus.h @@ -10,7 +10,6 @@
#include <linux/device.h> #include <linux/mod_devicetable.h> -#include <linux/slab.h>
struct auxiliary_device { struct device dev;