Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=838c41184fee5e151c09972f2ba90c16493af614
Commit:     838c41184fee5e151c09972f2ba90c16493af614
Parent:     3bd2aad2103314a0a09614dc29926a1437db02f7
Author:     Prarit Bhargava <[EMAIL PROTECTED]>
AuthorDate: Tue May 15 01:41:43 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue May 15 08:54:00 2007 -0700

    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 <[EMAIL PROTECTED]>
    Cc: Russell King <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 include/linux/init.h |    7 +------
 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__
 /*
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to