The patch titled Remove cpu hotplug defines for __INIT & __INITDATA has been added to the -mm tree. Its filename is remove-cpu-hotplug-defines-for-__init-__initdata.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: Remove cpu hotplug defines for __INIT & __INITDATA From: Prarit Bhargava <prarit@xxxxxxxxxx> After examining what was checked in and the code base I discovered that most of 86c0baf123e474b6eb404798926ecf62b426bf3a wasn't necessary anymore.... So here's a patch that reverts the last part of that changeset: Revert part of 86c0baf123e474b6eb404798926ecf62b426bf3a. The kernel has moved forward to a state where the original change is not necessary. After porting forward, this final version of the patch was applied and broke non-x86 architectures. Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx> Cc: Russell King <rmk@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/init.h | 7 +------ 1 files changed, 1 insertion(+), 6 deletions(-) diff -puN include/linux/init.h~remove-cpu-hotplug-defines-for-__init-__initdata include/linux/init.h --- a/include/linux/init.h~remove-cpu-hotplug-defines-for-__init-__initdata +++ a/include/linux/init.h @@ -52,14 +52,9 @@ #endif /* For assembly routines */ -#ifdef CONFIG_HOTPLUG_CPU -#define __INIT .section ".text","ax" -#define __INITDATA .section ".data","aw" -#else #define __INIT .section ".init.text","ax" -#define __INITDATA .section ".init.data","aw" -#endif #define __FINIT .previous +#define __INITDATA .section ".init.data","aw" #ifndef __ASSEMBLY__ /* _ Patches currently in -mm which might be from prarit@xxxxxxxxxx are remove-cpu-hotplug-defines-for-__init-__initdata.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