Skip to content

Commit

Permalink
powerpc: 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: Benjamin Herrenschmidt <benh@kernel.crashing.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 9760f8f commit e703984
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 6 deletions.
3 changes: 2 additions & 1 deletion arch/powerpc/kernel/head_32.S
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
*
*/

#include <linux/init.h>
#include <asm/reg.h>
#include <asm/page.h>
#include <asm/mmu.h>
Expand Down Expand Up @@ -50,7 +51,7 @@
mtspr SPRN_DBAT##n##L,RB; \
1:

.section .text.head, "ax"
__HEAD
.stabs "arch/powerpc/kernel/",N_SO,0,0,0f
.stabs "head_32.S",N_SO,0,0,0f
0:
Expand Down
3 changes: 2 additions & 1 deletion arch/powerpc/kernel/head_40x.S
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
*
*/

#include <linux/init.h>
#include <asm/processor.h>
#include <asm/page.h>
#include <asm/mmu.h>
Expand All @@ -52,7 +53,7 @@
*
* This is all going to change RSN when we add bi_recs....... -- Dan
*/
.section .text.head, "ax"
__HEAD
_ENTRY(_stext);
_ENTRY(_start);

Expand Down
3 changes: 2 additions & 1 deletion arch/powerpc/kernel/head_44x.S
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
* option) any later version.
*/

#include <linux/init.h>
#include <asm/processor.h>
#include <asm/page.h>
#include <asm/mmu.h>
Expand All @@ -50,7 +51,7 @@
* r7 - End of kernel command line string
*
*/
.section .text.head, "ax"
__HEAD
_ENTRY(_stext);
_ENTRY(_start);
/*
Expand Down
3 changes: 2 additions & 1 deletion arch/powerpc/kernel/head_8xx.S
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
*
*/

#include <linux/init.h>
#include <asm/processor.h>
#include <asm/page.h>
#include <asm/mmu.h>
Expand All @@ -38,7 +39,7 @@
#else
#define DO_8xx_CPU6(val, reg)
#endif
.section .text.head, "ax"
__HEAD
_ENTRY(_stext);
_ENTRY(_start);

Expand Down
3 changes: 2 additions & 1 deletion arch/powerpc/kernel/head_fsl_booke.S
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
* option) any later version.
*/

#include <linux/init.h>
#include <linux/threads.h>
#include <asm/processor.h>
#include <asm/page.h>
Expand All @@ -53,7 +54,7 @@
* r7 - End of kernel command line string
*
*/
.section .text.head, "ax"
__HEAD
_ENTRY(_stext);
_ENTRY(_start);
/*
Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/kernel/vmlinux.lds.S
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ SECTIONS
/* Text and gots */
.text : AT(ADDR(.text) - LOAD_OFFSET) {
ALIGN_FUNCTION();
*(.text.head)
HEAD_TEXT
_text = .;
*(.text .fixup .text.init.refok .exit.text.refok __ftr_alt_*)
SCHED_TEXT
Expand Down

0 comments on commit e703984

Please sign in to comment.