From: Greg Kroah-Hartman Date: Wed, 6 Jan 2021 18:05:25 +0000 (+0100) Subject: patch refresh for 4.4 X-Git-Tag: v4.4.250~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=303322cd2936dce2433618af5fd490b7b57eee3e;p=thirdparty%2Fkernel%2Fstable-queue.git patch refresh for 4.4 --- diff --git a/queue-4.4/module-delay-kobject-uevent-until-after-module-init-.patch b/queue-4.4/module-delay-kobject-uevent-until-after-module-init-.patch index 1609d16d475..8ca36f0bc46 100644 --- a/queue-4.4/module-delay-kobject-uevent-until-after-module-init-.patch +++ b/queue-4.4/module-delay-kobject-uevent-until-after-module-init-.patch @@ -34,14 +34,12 @@ Tested-By: Nicolas Morey-Chaisemartin Signed-off-by: Jessica Yu Signed-off-by: Sasha Levin --- - kernel/module.c | 5 +++-- + kernel/module.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -diff --git a/kernel/module.c b/kernel/module.c -index dcfc811d9ae2d..e6afc950357a5 100644 --- a/kernel/module.c +++ b/kernel/module.c -@@ -1779,7 +1779,6 @@ static int mod_sysfs_init(struct module *mod) +@@ -1779,7 +1779,6 @@ static int mod_sysfs_init(struct module if (err) mod_kobject_put(mod); @@ -49,7 +47,7 @@ index dcfc811d9ae2d..e6afc950357a5 100644 out: return err; } -@@ -1813,7 +1812,6 @@ static int mod_sysfs_setup(struct module *mod, +@@ -1813,7 +1812,6 @@ static int mod_sysfs_setup(struct module add_sect_attrs(mod, info); add_notes_attrs(mod, info); @@ -57,7 +55,7 @@ index dcfc811d9ae2d..e6afc950357a5 100644 return 0; out_unreg_param: -@@ -3301,6 +3299,9 @@ static noinline int do_init_module(struct module *mod) +@@ -3301,6 +3299,9 @@ static noinline int do_init_module(struc blocking_notifier_call_chain(&module_notify_list, MODULE_STATE_LIVE, mod); @@ -67,6 +65,3 @@ index dcfc811d9ae2d..e6afc950357a5 100644 /* * We need to finish all async code before the module init sequence * is done. This has potential to deadlock. For example, a newly --- -2.27.0 -