summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTim Abbott <tabbott@MIT.EDU>2009-04-27 20:02:25 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-28 04:51:58 +0200
commit882016ff3659126f6da50cf7cb84a0a15d00a87b (patch)
tree8d4762db9aaadc71f22d1a982f61d0551f214598 /arch
parentpowerpc: Use __REF macro instead of old .text.init.refok. (diff)
downloadlinux-882016ff3659126f6da50cf7cb84a0a15d00a87b.tar.xz
linux-882016ff3659126f6da50cf7cb84a0a15d00a87b.zip
sh: Use __INIT macro instead of .text.init.
The sh architecture has some code in the .text.init section, but it does not reference that section in its linker scripts. This change moves this code from the .text.init section to the .init.text section, which is presumably where it belongs. Signed-off-by: Tim Abbott <tabbott@mit.edu> Acked-by: Sam Ravnborg <sam@ravnborg.org> Acked-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/kernel/cpu/sh5/entry.S5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sh/kernel/cpu/sh5/entry.S b/arch/sh/kernel/cpu/sh5/entry.S
index e640c63d5811..7e49cb812f8b 100644
--- a/arch/sh/kernel/cpu/sh5/entry.S
+++ b/arch/sh/kernel/cpu/sh5/entry.S
@@ -10,6 +10,7 @@
* for more details.
*/
#include <linux/errno.h>
+#include <linux/init.h>
#include <linux/sys.h>
#include <cpu/registers.h>
#include <asm/processor.h>
@@ -2058,10 +2059,10 @@ asm_uaccess_end:
/*
- * --- .text.init Section
+ * --- .init.text Section
*/
- .section .text.init, "ax"
+ __INIT
/*
* void trap_init (void)