[SPARC32]: Correct init_thread_union section and alignment for gcc 3.3+

Recent tools are disregarding both the __asm__(".text") in init_task.c
and the alignment at the end of .text in head.S.  Use attributes
instead.

diff --git a/arch/sparc/kernel/head.S b/arch/sparc/kernel/head.S
index 0e669d0bfbe1bc7ababe2cabbb6f965e24e4bacb..42d3de59d19bfe931566d43dac181c71abb68632 100644 (file)
--- a/arch/sparc/kernel/head.S
+++ b/arch/sparc/kernel/head.S
@@ -746,9 +746,6 @@ go_to_highmem:
                jmpl    %g1, %g0
                 nop
 
-       /* This is to align init_thread_union properly, be careful. -DaveM */
-       .align  8192
-
 /* The code above should be at beginning and we have to take care about
  * short jumps, as branching to .text.init section from .text is usually
  * impossible */

diff --git a/arch/sparc/kernel/init_task.c b/arch/sparc/kernel/init_task.c
index 8b451b235665fe09bfadfc5065b47626ec1b2593..0b29e5fa130f43a2ed8a4e0d69ce99ac86d4a81d 100644 (file)
--- a/arch/sparc/kernel/init_task.c
+++ b/arch/sparc/kernel/init_task.c
@@ -21,5 +21,7 @@ EXPORT_SYMBOL(init_task);
  * If this is not aligned on a 8k boundry, then you should change code
  * in etrap.S which assumes it.
  */
-__asm__(".section \".text\",#alloc\n");
-union thread_union init_thread_union = { INIT_THREAD_INFO(init_task) };
+union thread_union init_thread_union
+       __attribute__((section (".text")))
+       __attribute__((aligned (THREAD_SIZE)))
+       = { INIT_THREAD_INFO(init_task) };