Эх сурвалжийг харах

m32r: section noise in head.S

usual "introduce .text.head, put it in front of TEXT_TEXT in vmlinux.lds.S,
make the stuff up to jump to start_kernel live in it", same as on other
targets.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Al Viro 16 жил өмнө
parent
commit
1c4567aeed

+ 2 - 2
arch/m32r/kernel/head.S

@@ -23,7 +23,7 @@ __INITDATA
 /*
 /*
  * References to members of the boot_cpu_data structure.
  * References to members of the boot_cpu_data structure.
  */
  */
-	.text
+.section .text.head, "ax"
 	.global	start_kernel
 	.global	start_kernel
 	.global __bss_start
 	.global __bss_start
 	.global _end
 	.global _end
@@ -133,7 +133,6 @@ loop1:
 /*
 /*
  * AP startup routine
  * AP startup routine
  */
  */
-	.text
 	.global	eit_vector
 	.global	eit_vector
 ENTRY(startup_AP)
 ENTRY(startup_AP)
 ;; setup EVB
 ;; setup EVB
@@ -230,6 +229,7 @@ ENTRY(startup_AP)
 	nop
 	nop
 #endif  /* CONFIG_SMP */
 #endif  /* CONFIG_SMP */
 
 
+	.text
 ENTRY(stack_start)
 ENTRY(stack_start)
 	.long	init_thread_union+8192
 	.long	init_thread_union+8192
 	.long	__KERNEL_DS
 	.long	__KERNEL_DS

+ 1 - 0
arch/m32r/kernel/vmlinux.lds.S

@@ -27,6 +27,7 @@ SECTIONS
   _text = .;			/* Text and read-only data */
   _text = .;			/* Text and read-only data */
   .boot : { *(.boot) } = 0
   .boot : { *(.boot) } = 0
   .text : {
   .text : {
+	*(.text.head)
 	TEXT_TEXT
 	TEXT_TEXT
 	SCHED_TEXT
 	SCHED_TEXT
 	LOCK_TEXT
 	LOCK_TEXT