Remove cpu hotplug defines for __INIT & __INITDATA

After examining what was checked in and the code base I discovered that most
of 4235a75f2097c228cb997c0fd47b3416c7c435b8 wasn't necessary anymore....

So here's a patch that reverts the last part of that changeset:

Revert part of 4235a75f2097c228cb997c0fd47b3416c7c435b8.

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@redhat.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/linux/init.h b/include/linux/init.h
index 8bc32bb2fce20a23e04b9327b1912a59f5e97252..e007ae4dc41e7c553fe44aaea3a11dc81f1a9779 100644 (file)
--- a/include/linux/init.h
+++ b/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__
 /*