[RFC 10/10] xtensa: vmlinux.lds.S - use PAGE_SIZE, THREAD_SIZE macroses

gorcunov
2008-02-27T21:03:05Z

[-- Attachment #1: xtensa-vmlinux --]
[-- Type: text/plain, Size: 2292 bytes --]

This patch includes page.h and thread_info.h headers into the linker
script that allow us to use PAGE_SIZE and THREAD_SIZE macroses
instead of numeric constants

Also a few spaces removed

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---

WARNING: COMPLETELY UNTESTED !!!

vmlinux.lds.S | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)

Index: linux-2.6.git/arch/xtensa/kernel/vmlinux.lds.S
===================================================================
--- linux-2.6.git.orig/arch/xtensa/kernel/vmlinux.lds.S 2008-02-26 21:45:46.000000000 +0300
+++ linux-2.6.git/arch/xtensa/kernel/vmlinux.lds.S 2008-02-27 22:15:04.000000000 +0300
@@ -15,6 +15,8 @@
*/

#include <asm-generic/vmlinux.lds.h>
+#include <asm/page.h>
+#include <asm/thread_info.h>

#include <asm/variant/core.h>
OUTPUT_ARCH(xtensa)
@@ -127,16 +129,16 @@ SECTIONS
_edata = .;

/* The initial task */
- . = ALIGN(8192);
+ . = ALIGN(THREAD_SIZE);
.data.init_task : { *(.data.init_task) }

/* Initialization code and data: */

- . = ALIGN(1 << 12);
+ . = ALIGN(PAGE_SIZE);
__init_begin = .;
.init.text : {
_sinittext = .;
- *(.init.literal) *(.cpuinit.literal)
+ *(.init.literal) *(.cpuinit.literal)
*(.devinit.literal) *(.meminit.literal)
INIT_TEXT
_einittext = .;
@@ -165,7 +167,7 @@ SECTIONS
.DoubleExceptionVector.text);
RELOCATE_ENTRY(_DebugInterruptVector_text,
.DebugInterruptVector.text);
-
+
__boot_reloc_table_end = ABSOLUTE(.) ;
}

@@ -189,14 +191,13 @@ SECTIONS

#ifdef CONFIG_BLK_DEV_INITRD
- . = ALIGN(4096);
+ . = ALIGN(PAGE_SIZE);
__initramfs_start =.;
.init.ramfs : { *(.init.ramfs) }
__initramfs_end = .;
#endif

- PERCPU(4096)
-
+ PERCPU(PAGE_SIZE)

/* We need this dummy segment here */

@@ -251,7 +252,7 @@ SECTIONS
.DoubleExceptionVector.literal)

. = (LOADADDR( .DoubleExceptionVector.text ) + SIZEOF( .DoubleExceptionVector.text ) + 3) & ~ 3;
- . = ALIGN(1 << 12);
+ . = ALIGN(PAGE_SIZE);

__init_end = .;

@@ -269,7 +270,7 @@ SECTIONS
. = ALIGN(0x10);
.bootstrap : { *(.bootstrap.literal .bootstrap.text .bootstrap.data) }

- . = ALIGN(0x1000);
+ . = ALIGN(PAGE_SIZE);
__initrd_start = .;
.initrd : { *(.initrd) }
__initrd_end = .;

--