Re: [PATCH v3 4/7] m68knommu: Use more macros inside the .initsection.

[Tim Abbott]

On Tue, 13 Oct 2009, Greg Ungerer wrote:

> Hi Tim,
> 
> Tim Abbott wrote:
> > Signed-off-by: Tim Abbott <tabbott@xxxxxxxxxxx>
> > ---
> >  arch/m68knommu/kernel/vmlinux.lds.S |   23 +++++------------------
> >  1 files changed, 5 insertions(+), 18 deletions(-)
> > 
> > diff --git a/arch/m68knommu/kernel/vmlinux.lds.S
> > b/arch/m68knommu/kernel/vmlinux.lds.S
> > index 153569b..f7df82a 100644
> > --- a/arch/m68knommu/kernel/vmlinux.lds.S
> > +++ b/arch/m68knommu/kernel/vmlinux.lds.S
> > @@ -161,25 +161,12 @@ SECTIONS {
> >  		INIT_TEXT
> >  		_einittext = .;
> >  		INIT_DATA
> > -		. = ALIGN(16);
> > -		__setup_start = .;
> > -		*(.init.setup)
> > -		__setup_end = .;
> > -		__initcall_start = .;
> > +		INIT_SETUP(16)
> > +		INIT_CALL
>                 ^^^^^^^^^^
> I take it this should be INIT_CALLS?

Oops, yes.  Also the INITCALLS on the following line should be deleted.  
So it should look like the below patch.

> With this patch applied the kernel no longer boots. All previous
> patches (so 1, 2 and 3) applied run fine.

Hopefully this is because we had INIT_CALLS followed by INITCALLS.  If it 
doesn't boot using the patch below instead, then that would be surprising 
to me.

	-Tim Abbott

m68knommu: Use more macros inside the .init section.

Signed-off-by: Tim Abbott <tabbott@xxxxxxxxxxx>
---
 arch/m68knommu/kernel/vmlinux.lds.S |   24 +++++-------------------
 1 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S
index 153569b..ac7e785 100644
--- a/arch/m68knommu/kernel/vmlinux.lds.S
+++ b/arch/m68knommu/kernel/vmlinux.lds.S
@@ -161,25 +161,11 @@ SECTIONS {
 		INIT_TEXT
 		_einittext = .;
 		INIT_DATA
-		. = ALIGN(16);
-		__setup_start = .;
-		*(.init.setup)
-		__setup_end = .;
-		__initcall_start = .;
-		INITCALLS
-		__initcall_end = .;
-		__con_initcall_start = .;
-		*(.con_initcall.init)
-		__con_initcall_end = .;
-		__security_initcall_start = .;
-		*(.security_initcall.init)
-		__security_initcall_end = .;
-#ifdef CONFIG_BLK_DEV_INITRD
-		. = ALIGN(4);
-		__initramfs_start = .;
-		*(.init.ramfs)
-		__initramfs_end = .;
-#endif
+		INIT_SETUP(16)
+		INIT_CALLS
+		CON_INITCALL
+		SECURITY_INITCALL
+		INIT_RAM_FS
 		. = ALIGN(PAGE_SIZE);
 		__init_end = .;
 	} > INIT
-- 
1.6.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/