sh: convert to use __HEAD and HEAD_TEXT macros.

This has the consequence of changing the section name use for head
code from ".text.head" to ".head.text".  Since this commit changes all
users in the architecture, this change should be harmless.

Signed-off-by: Tim Abbott <tabbott@mit.edu>
Cc: Paul Mundt <lethal@linux-sh.org>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/sh/kernel/head_32.S b/arch/sh/kernel/head_32.S
index 788605f..a78be74 100644 (file)
--- a/arch/sh/kernel/head_32.S
+++ b/arch/sh/kernel/head_32.S
@@ -10,6 +10,7 @@
  *
  * Head.S contains the SH exception handlers and startup code.
  */
  *
  * Head.S contains the SH exception handlers and startup code.
  */

+#include <linux/init.h>

 #include <linux/linkage.h>
 #include <asm/thread_info.h>
 
 #include <linux/linkage.h>
 #include <asm/thread_info.h>
 


@@ -40,7 +41,7 @@ ENTRY(empty_zero_page)
 1:
        .skip   PAGE_SIZE - empty_zero_page - 1b
 
 1:
        .skip   PAGE_SIZE - empty_zero_page - 1b
 

-       .section        .text.head, "ax"
+       __HEAD

 
 /*
  * Condition at the entry of _stext:
 
 /*
  * Condition at the entry of _stext:

diff --git a/arch/sh/kernel/head_64.S b/arch/sh/kernel/head_64.S
index 7ccfb99..3ea7658 100644 (file)
--- a/arch/sh/kernel/head_64.S
+++ b/arch/sh/kernel/head_64.S
@@ -8,6 +8,9 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  */
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  */

+
+#include <linux/init.h>
+

 #include <asm/page.h>
 #include <asm/cache.h>
 #include <asm/tlb.h>
 #include <asm/page.h>
 #include <asm/cache.h>
 #include <asm/tlb.h>


@@ -110,7 +113,7 @@ empty_bad_pte_table:
 fpu_in_use:    .quad   0
 
 
 fpu_in_use:    .quad   0
 
 

-       .section        .text.head, "ax"
+       __HEAD

        .balign L1_CACHE_BYTES
 /*
  * Condition at the entry of __stext:
        .balign L1_CACHE_BYTES
 /*
  * Condition at the entry of __stext:

diff --git a/arch/sh/kernel/vmlinux_32.lds.S b/arch/sh/kernel/vmlinux_32.lds.S
index d0b2a71..dd9b2ee 100644 (file)
--- a/arch/sh/kernel/vmlinux_32.lds.S
+++ b/arch/sh/kernel/vmlinux_32.lds.S
@@ -31,7 +31,7 @@ SECTIONS
        } = 0
 
        .text : {
        } = 0
 
        .text : {

-               *(.text.head)
+               HEAD_TEXT

                TEXT_TEXT
                SCHED_TEXT
                LOCK_TEXT
                TEXT_TEXT
                SCHED_TEXT
                LOCK_TEXT

diff --git a/arch/sh/kernel/vmlinux_64.lds.S b/arch/sh/kernel/vmlinux_64.lds.S
index 33fa464..6966446 100644 (file)
--- a/arch/sh/kernel/vmlinux_64.lds.S
+++ b/arch/sh/kernel/vmlinux_64.lds.S
@@ -42,7 +42,7 @@ SECTIONS
        } = 0
 
        .text : C_PHYS(.text) {
        } = 0
 
        .text : C_PHYS(.text) {

-               *(.text.head)
+               HEAD_TEXT

                TEXT_TEXT
                *(.text64)
                *(.text..SHmedia32)
                TEXT_TEXT
                *(.text64)
                *(.text..SHmedia32)