[PATCH 3/8] m68k: use .text.head

[PATCH 3/8] m68k: use .text.head

[Al Viro]

i.e. tell modpost that entry point code (that has to be outside
of .init.text for external reasons) is OK to refer to .init.*

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
 arch/m68k/kernel/head.S           |    2 +-
 arch/m68k/kernel/sun3-head.S      |    2 +-
 arch/m68k/kernel/vmlinux-std.lds  |    1 +
 arch/m68k/kernel/vmlinux-sun3.lds |    2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S
index 05741f2..faa6764 100644
--- a/arch/m68k/kernel/head.S
+++ b/arch/m68k/kernel/head.S
@@ -577,7 +577,7 @@ func_define	putn,1
 #endif
 .endm
 
-.text
+.section ".text.head","ax"
 ENTRY(_stext)
 /*
  * Version numbers of the bootinfo interface
diff --git a/arch/m68k/kernel/sun3-head.S b/arch/m68k/kernel/sun3-head.S
index 4b5f050..aad0159 100644
--- a/arch/m68k/kernel/sun3-head.S
+++ b/arch/m68k/kernel/sun3-head.S
@@ -29,7 +29,7 @@ kernel_pmd_table:              .skip 0x2000
 .globl kernel_pg_dir
 .equ    kernel_pg_dir,kernel_pmd_table
 
-	.section .head
+	.section .text.head
 ENTRY(_stext)
 ENTRY(_start)
 
diff --git a/arch/m68k/kernel/vmlinux-std.lds b/arch/m68k/kernel/vmlinux-std.lds
index 40f02b1..c422457 100644
--- a/arch/m68k/kernel/vmlinux-std.lds
+++ b/arch/m68k/kernel/vmlinux-std.lds
@@ -11,6 +11,7 @@ SECTIONS
   . = 0x1000;
   _text = .;			/* Text and read-only data */
   .text : {
+	*(.text.head)
 	TEXT_TEXT
 	SCHED_TEXT
 	LOCK_TEXT
diff --git a/arch/m68k/kernel/vmlinux-sun3.lds b/arch/m68k/kernel/vmlinux-sun3.lds
index f06425b..4adffef 100644
--- a/arch/m68k/kernel/vmlinux-sun3.lds
+++ b/arch/m68k/kernel/vmlinux-sun3.lds
@@ -11,7 +11,7 @@ SECTIONS
   . = 0xE002000;
   _text = .;			/* Text and read-only data */
   .text : {
-	*(.head)
+	*(.text.head)
 	TEXT_TEXT
 	SCHED_TEXT
 	LOCK_TEXT
-- 
1.5.3.GIT

Re: [PATCH 3/8] m68k: use .text.head

[Heiko Carstens]

On Fri, Jul 20, 2007 at 04:33:08AM +0100, Al Viro wrote:
> 
> i.e. tell modpost that entry point code (that has to be outside
> of .init.text for external reasons) is OK to refer to .init.*
> 
> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
> ---
> diff --git a/arch/m68k/kernel/sun3-head.S b/arch/m68k/kernel/sun3-head.S
> index 4b5f050..aad0159 100644
> --- a/arch/m68k/kernel/sun3-head.S
> +++ b/arch/m68k/kernel/sun3-head.S
> @@ -29,7 +29,7 @@ kernel_pmd_table:              .skip 0x2000
>  .globl kernel_pg_dir
>  .equ    kernel_pg_dir,kernel_pmd_table
> 
> -	.section .head
> +	.section .text.head
>  ENTRY(_stext)
>  ENTRY(_start)
> 
> diff --git a/arch/m68k/kernel/vmlinux-sun3.lds b/arch/m68k/kernel/vmlinux-sun3.lds
> index f06425b..4adffef 100644
> --- a/arch/m68k/kernel/vmlinux-sun3.lds
> +++ b/arch/m68k/kernel/vmlinux-sun3.lds
> @@ -11,7 +11,7 @@ SECTIONS
>    . = 0xE002000;
>    _text = .;			/* Text and read-only data */
>    .text : {
> -	*(.head)
> +	*(.text.head)
>  	TEXT_TEXT
>  	SCHED_TEXT
>  	LOCK_TEXT

I was wondering how to "fix" this on s390 since we have the same issue.
So I'll do it the same way here. Thanks.

Re: [PATCH 3/8] m68k: use .text.head

[Paul Mundt]

On Fri, Jul 20, 2007 at 10:06:24AM +0200, Heiko Carstens wrote:
> On Fri, Jul 20, 2007 at 04:33:08AM +0100, Al Viro wrote:
> > 
> > i.e. tell modpost that entry point code (that has to be outside
> > of .init.text for external reasons) is OK to refer to .init.*
> > 
> I was wondering how to "fix" this on s390 since we have the same issue.
> So I'll do it the same way here. Thanks.

Likewise for sh/sh64. Perhaps this should be reposted to linux-arch ;-)