Subject: [merged] inith-add-missing-initcall-variants.patch removed from -mm tree To: rdunlap@xxxxxxxxxxxxx,benh@xxxxxxxxxxxxxxxxxxx,geert@xxxxxxxxxxxxxx,timur@xxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Thu, 12 Dec 2013 12:47:44 -0800 The patch titled Subject: init.h: add missing initcall variants has been removed from the -mm tree. Its filename was inith-add-missing-initcall-variants.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Subject: init.h: add missing initcall variants Add missing initcall variants when building for loadable modules. This fixes this build error on powerpc allmodconfig: drivers/tty/ehv_bytechan.c: error: type defaults to 'int' in declaration of 'console_initcall' [-Werror=implicit-int] Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Reported-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Cc: Timur Tabi <timur@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/init.h | 2 ++ 1 file changed, 2 insertions(+) diff -puN include/linux/init.h~inith-add-missing-initcall-variants include/linux/init.h --- a/include/linux/init.h~inith-add-missing-initcall-variants +++ a/include/linux/init.h @@ -286,9 +286,11 @@ void __init parse_early_options(char *cm #define arch_initcall(fn) module_init(fn) #define subsys_initcall(fn) module_init(fn) #define fs_initcall(fn) module_init(fn) +#define rootfs_initcall(fn) module_init(fn) #define device_initcall(fn) module_init(fn) #define late_initcall(fn) module_init(fn) +#define console_initcall(fn) module_init(fn) #define security_initcall(fn) module_init(fn) /* Each module must use one module_init(). */ _ Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxxx are drm-nouveau-make-vga_switcheroo-code-depend-on-vga_switcheroo.patch mtd-cmdlinepart-use-cmdline-partition-parser-lib-fix.patch drivers-block-kconfig-update-ram-block-device-module-name.patch documentation-blockdev-ramdisktxt-updates.patch linux-next.patch debugging-keep-track-of-page-owners.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html