Re: [PATCH] m68knommu: Clean up linker script using new linker scriptmacros.

[Tim Abbott]

On Mon, 7 Sep 2009, Greg Ungerer wrote:

> Now, back to the original patch. Now fails with another syntax error
> at the last line in this:
> 
>  .init : {
>   . = ALIGN((1 << (12)));
>   __init_begin = .;
>   . = ALIGN((1 << (12))); .init.text : AT(ADDR(.init.text) - 0) { _sinittext =
> .; *(.init.text) *(.devinit.text) *(.cpuinit.text) *(.meminit.text) _einittext
> = .; }

Oops.  The ".init : { }" wrapping the new macros there should have been 
removed.

The following patch should fix this issue (obviously, you'll want to 
squash it with the original patch, but I figure sending the diff will be 
easier to review).

	-Tim Abbott

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

diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S
index 979acb5..c380040 100644
--- a/arch/m68knommu/kernel/vmlinux.lds.S
+++ b/arch/m68knommu/kernel/vmlinux.lds.S
@@ -154,14 +154,12 @@ SECTIONS {
 		_edata = . ;
 	} > DATA
 
-	.init : {
-		. = ALIGN(PAGE_SIZE);
-		__init_begin = .;
-		INIT_TEXT_SECTION(PAGE_SIZE)
-		INIT_DATA_SECTION(16)
-		. = ALIGN(PAGE_SIZE);
-		__init_end = .;
-	} > INIT
+	. = ALIGN(PAGE_SIZE);
+	__init_begin = .;
+	INIT_TEXT_SECTION(PAGE_SIZE) > INIT
+	INIT_DATA_SECTION(16) > INIT
+	. = ALIGN(PAGE_SIZE);
+	__init_end = .;
 
 	/DISCARD/ : {
 		EXIT_TEXT
-- 
1.6.3.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/