Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751462AbZJNEX6 (ORCPT ); Wed, 14 Oct 2009 00:23:58 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751395AbZJNEX5 (ORCPT ); Wed, 14 Oct 2009 00:23:57 -0400 Received: from rex.securecomputing.com ([203.24.151.4]:46714 "EHLO cyberguard.com.au" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751167AbZJNEX5 (ORCPT ); Wed, 14 Oct 2009 00:23:57 -0400 Message-ID: <4AD5521E.5000306@snapgear.com> Date: Wed, 14 Oct 2009 14:22:54 +1000 From: Greg Ungerer User-Agent: Thunderbird 2.0.0.19 (X11/20090105) MIME-Version: 1.0 To: Tim Abbott CC: linux-kernel@vger.kernel.org, Sam Ravnborg Subject: Re: [PATCH v3 4/7] m68knommu: Use more macros inside the .init section. References: <4AD3BFD8.90408@snapgear.com> <1255397413-4862-1-git-send-email-tabbott@ksplice.com> <1255397413-4862-2-git-send-email-tabbott@ksplice.com> <1255397413-4862-3-git-send-email-tabbott@ksplice.com> <1255397413-4862-4-git-send-email-tabbott@ksplice.com> <1255397413-4862-5-git-send-email-tabbott@ksplice.com> <4AD4166C.5090306@snapgear.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3121 Lines: 105 Hi Tim, Tim Abbott wrote: > On Tue, 13 Oct 2009, Greg Ungerer wrote: > >> Hi Tim, >> >> Tim Abbott wrote: >>> Signed-off-by: Tim Abbott >>> --- >>> 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. Runs fine with this updated patch. Trying the rest of the series now. Regards Greg > m68knommu: Use more macros inside the .init section. > > Signed-off-by: Tim Abbott > --- > 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 -- ------------------------------------------------------------------------ Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com SnapGear Group, McAfee PHONE: +61 7 3435 2888 825 Stanley St, FAX: +61 7 3891 3630 Woolloongabba, QLD, 4102, Australia WEB: http://www.SnapGear.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/