lkml.org 
[lkml]   [2009]   [Sep]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH] m68knommu: Clean up linker script using new linker script macros.
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@ksplice.com>
---
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


\
 
 \ /
  Last update: 2009-09-07 16:25    [W:0.092 / U:0.360 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site