From 1e4229666d228195ab7c56313600694f0eee118d Mon Sep 17 00:00:00 2001
From: Prarit Bhargava <prarit@redhat.com>
Date: Tue, 15 May 2007 01:41:43 -0700
Subject: [PATCH] --- yaml --- r: 56395 b: refs/heads/master c:
 838c41184fee5e151c09972f2ba90c16493af614 h: refs/heads/master i:   56393:
 48ee019151be9f1b032165da41b1cdb1a1613e98   56391:
 a58d7ef26d3670c7b190a74ad865ee66bec72d42 v: v3

---
 [refs]                     | 2 +-
 trunk/include/linux/init.h | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

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__
 /*