summaryrefslogtreecommitdiffstats
path: root/include/linux/init.h
diff options
context:
space:
mode:
authorPrarit Bhargava <prarit@redhat.com>2007-05-15 01:41:43 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-15 08:54:00 -0700
commit838c41184fee5e151c09972f2ba90c16493af614 (patch)
tree72dd37c37031f1ed6c4c3ed43a45f3dce8dcf149 /include/linux/init.h
parent3bd2aad2103314a0a09614dc29926a1437db02f7 (diff)
downloadop-kernel-dev-838c41184fee5e151c09972f2ba90c16493af614.zip
op-kernel-dev-838c41184fee5e151c09972f2ba90c16493af614.tar.gz
Remove cpu hotplug defines for __INIT & __INITDATA
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@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>
Diffstat (limited to 'include/linux/init.h')
-rw-r--r--include/linux/init.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/init.h b/include/linux/init.h
index 8bc32bb..e007ae4 100644
--- 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__
/*
OpenPOWER on IntegriCloud