Skip to content

Commit

Permalink
sh: convert to use __HEAD and HEAD_TEXT macros.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tim Abbott authored and Linus Torvalds committed Apr 26, 2009
1 parent 2133bb8 commit bbe215c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
3 changes: 2 additions & 1 deletion arch/sh/kernel/head_32.S
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*
* Head.S contains the SH exception handlers and startup code.
*/
#include <linux/init.h>
#include <linux/linkage.h>
#include <asm/thread_info.h>

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

.section .text.head, "ax"
__HEAD

/*
* Condition at the entry of _stext:
Expand Down
5 changes: 4 additions & 1 deletion arch/sh/kernel/head_64.S
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
* 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>
Expand Down Expand Up @@ -110,7 +113,7 @@ empty_bad_pte_table:
fpu_in_use: .quad 0


.section .text.head, "ax"
__HEAD
.balign L1_CACHE_BYTES
/*
* Condition at the entry of __stext:
Expand Down
2 changes: 1 addition & 1 deletion arch/sh/kernel/vmlinux_32.lds.S
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ SECTIONS
} = 0

.text : {
*(.text.head)
HEAD_TEXT
TEXT_TEXT
SCHED_TEXT
LOCK_TEXT
Expand Down
2 changes: 1 addition & 1 deletion arch/sh/kernel/vmlinux_64.lds.S
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ SECTIONS
} = 0

.text : C_PHYS(.text) {
*(.text.head)
HEAD_TEXT
TEXT_TEXT
*(.text64)
*(.text..SHmedia32)
Expand Down

0 comments on commit bbe215c

Please sign in to comment.