What started as a removal of no longer required include <linux/init.h> due to the earlier __cpuinit and __devinit removal led to the observation that some module specfic support was living in init.h itself, thus preventing the full removal from introducing compile regressions. This series of commits includes the final relocation of the modular init code from <init.h> to <module.h> -- we do this because modular users will always be users of init functionality, but users of init functionality are not necessarily always modules. Once done, the trivial one line removals can be finalized at any time, a bit at a time, through maintainer trees etc. In order to do that, a couple of final things that this will uncover are fixed up here -- things that weren't easily categorized into any of the other previous series leading up to this final one. The previous groupings of commits that get us to this final series are: 1: [PATCH 00/11] Delete new __cpuinit users and then delete stubs https://lkml.kernel.org/r/1430174880-27958-1-git-send-email-paul.gortmaker@xxxxxxxxxxxxx 2: [PATCH 00/11] Fix implicit includes of <module.h> that will break. https://lkml.kernel.org/r/1430444867-22342-1-git-send-email-paul.gortmaker@xxxxxxxxxxxxx> 3: [PATCH 00/15] Replace module_init with device_initcall in non modules https://lkml.kernel.org/r/1432860493-23831-1-git-send-email-paul.gortmaker@xxxxxxxxxxxxx 4: [PATCH 00/11] Replace module_init with an alternate initcall in non modules https://lkml.kernel.org/r/1433120052-18281-1-git-send-email-paul.gortmaker@xxxxxxxxxxxxx 5: [PATCH 0/7] Introduce builtin_driver and use it for non-modular code https://lkml.kernel.org/r/1431287385-1526-1-git-send-email-paul.gortmaker@xxxxxxxxxxxxx> This group of six is factored out from what was a previously larger series[1] so that there is a common theme and lower patch count to ease review. Setting aside the trivial one line include <linux/init.h> removals for later also greatly reduces the series size and makes all six parts more manageable. Paul. [1] http://lkml.kernel.org/r/1390339396-3479-1-git-send-email-paul.gortmaker@xxxxxxxxxxxxx --- Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Cc: Russell King <linux@xxxxxxxxxxxxxxxx> Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx Cc: linux-mips@xxxxxxxxxxxxxx Cc: x86@xxxxxxxxxx Paul Gortmaker (4): x86: replace __init_or_module with __init in non-modular vsmp_64.c arm: fix implicit #include <linux/init.h> in entry asm. mips: make loongsoon serial driver explicitly modular module: relocate module_init from init.h to module.h arch/arm/kernel/entry-armv.S | 2 + arch/mips/loongson/common/serial.c | 9 +++- arch/x86/kernel/vsmp_64.c | 2 +- include/linux/init.h | 78 ----------------------------------- include/linux/module.h | 84 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 94 insertions(+), 81 deletions(-) -- 2.2.1