ソースを参照

powerpc: 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: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Tim Abbott 16 年 前
コミット
e703984587

+ 2 - 1
arch/powerpc/kernel/head_32.S

@@ -21,6 +21,7 @@
  *
  *
  */
  */
 
 
+#include <linux/init.h>
 #include <asm/reg.h>
 #include <asm/reg.h>
 #include <asm/page.h>
 #include <asm/page.h>
 #include <asm/mmu.h>
 #include <asm/mmu.h>
@@ -50,7 +51,7 @@
 	mtspr	SPRN_DBAT##n##L,RB;	\
 	mtspr	SPRN_DBAT##n##L,RB;	\
 1:
 1:
 
 
-	.section	.text.head, "ax"
+	__HEAD
 	.stabs	"arch/powerpc/kernel/",N_SO,0,0,0f
 	.stabs	"arch/powerpc/kernel/",N_SO,0,0,0f
 	.stabs	"head_32.S",N_SO,0,0,0f
 	.stabs	"head_32.S",N_SO,0,0,0f
 0:
 0:

+ 2 - 1
arch/powerpc/kernel/head_40x.S

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

+ 2 - 1
arch/powerpc/kernel/head_44x.S

@@ -28,6 +28,7 @@
  * option) any later version.
  * option) any later version.
  */
  */
 
 
+#include <linux/init.h>
 #include <asm/processor.h>
 #include <asm/processor.h>
 #include <asm/page.h>
 #include <asm/page.h>
 #include <asm/mmu.h>
 #include <asm/mmu.h>
@@ -50,7 +51,7 @@
  *   r7 - End of kernel command line string
  *   r7 - End of kernel command line string
  *
  *
  */
  */
-	.section	.text.head, "ax"
+	__HEAD
 _ENTRY(_stext);
 _ENTRY(_stext);
 _ENTRY(_start);
 _ENTRY(_start);
 	/*
 	/*

+ 2 - 1
arch/powerpc/kernel/head_8xx.S

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

+ 2 - 1
arch/powerpc/kernel/head_fsl_booke.S

@@ -30,6 +30,7 @@
  * option) any later version.
  * option) any later version.
  */
  */
 
 
+#include <linux/init.h>
 #include <linux/threads.h>
 #include <linux/threads.h>
 #include <asm/processor.h>
 #include <asm/processor.h>
 #include <asm/page.h>
 #include <asm/page.h>
@@ -53,7 +54,7 @@
  *   r7 - End of kernel command line string
  *   r7 - End of kernel command line string
  *
  *
  */
  */
-	.section	.text.head, "ax"
+	__HEAD
 _ENTRY(_stext);
 _ENTRY(_stext);
 _ENTRY(_start);
 _ENTRY(_start);
 	/*
 	/*

+ 1 - 1
arch/powerpc/kernel/vmlinux.lds.S

@@ -52,7 +52,7 @@ SECTIONS
 	/* Text and gots */
 	/* Text and gots */
 	.text : AT(ADDR(.text) - LOAD_OFFSET) {
 	.text : AT(ADDR(.text) - LOAD_OFFSET) {
 		ALIGN_FUNCTION();
 		ALIGN_FUNCTION();
-		*(.text.head)
+		HEAD_TEXT
 		_text = .;
 		_text = .;
 		*(.text .fixup .text.init.refok .exit.text.refok __ftr_alt_*)
 		*(.text .fixup .text.init.refok .exit.text.refok __ftr_alt_*)
 		SCHED_TEXT
 		SCHED_TEXT