diff --git a/[refs] b/[refs]
index 7d910c8229e3..360cb485ac94 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bd2aad2103314a0a09614dc29926a1437db02f7
+refs/heads/master: 838c41184fee5e151c09972f2ba90c16493af614
diff --git a/trunk/include/linux/init.h b/trunk/include/linux/init.h
index 8bc32bb2fce2..e007ae4dc41e 100644
--- a/trunk/include/linux/init.h
+++ b/trunk/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__
 /*