| Message ID | 20160927011821.6635-1-paul.gortmaker@windriver.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Herbert Xu |
| Headers | show |
On 2016-09-26 21:18:21 [-0400], Paul Gortmaker wrote: > > ...and so it currently is not being built as a module by anyone. that is correct. Acked-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Sebastian -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/kernel/padata.c b/kernel/padata.c index 7848f0566403..355807e52b1e 100644 --- a/kernel/padata.c +++ b/kernel/padata.c @@ -30,7 +30,7 @@ #include <linux/slab.h> #include <linux/sysfs.h> #include <linux/rcupdate.h> -#include <linux/module.h> +#include <linux/init.h> #define MAX_OBJ_NUM 1000 @@ -1043,11 +1043,6 @@ static __init int padata_driver_init(void) hp_online = ret; return 0; } -module_init(padata_driver_init); +device_initcall(padata_driver_init); -static __exit void padata_driver_exit(void) -{ - cpuhp_remove_multi_state(hp_online); -} -module_exit(padata_driver_exit); #endif
In commit 30e92153b4e6 ("padata: Convert to hotplug state machine") this file started using module.h and got module_init and module_exit added to it. However the Kconfig for it is: init/Kconfig:config PADATA init/Kconfig: depends on SMP init/Kconfig: bool ...and so it currently is not being built as a module by anyone. Lets remove the modular code that is essentially orphaned, so that when reading the driver there is no doubt it is builtin-only. Since module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. Cc: Steffen Klassert <steffen.klassert@secunet.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Cc: linux-crypto@vger.kernel.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- kernel/padata.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)