vserver 1.9.5.x5

[linux-2.6.git] / arch / arm26 / kernel / vmlinux-arm26-xip.lds.in

diff --git a/arch/arm26/kernel/vmlinux-arm26-xip.lds.in b/arch/arm26/kernel/vmlinux-arm26-xip.lds.in
index cbbda27..ca61ec8 100644 (file)
--- a/arch/arm26/kernel/vmlinux-arm26-xip.lds.in
+++ b/arch/arm26/kernel/vmlinux-arm26-xip.lds.in
@@ -64,6 +64,7 @@ SECTIONS
                _text = .;              /* Text and read-only data      */
                        *(.text)
                        SCHED_TEXT
+                       LOCK_TEXT       /* FIXME - borrowed from arm32 - check*/
                        *(.fixup)
                        *(.gnu.warning)
                        *(.rodata)
@@ -91,9 +92,11 @@ SECTIONS
        _sdata = .;
 
        .data : {
+               . = ALIGN(8192);
                /*
                 * first, the init thread union, aligned
-                * to an 8192 byte boundary.
+                * to an 8192 byte boundary. (see arm26/kernel/init_task.c)
+                * FIXME - sould this be 32K aligned on arm26?
                 */
                *(.init.task)