LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: gorcunov@gmail.com
To: rth@twiddle.net, chris@zankel.net, jdike@addtoit.com,
	linuxppc-dev@ozlabs.org, paulus@samba.org, dhowells@redhat.com,
	zippel@linux-m68k.org, geert@linux-m68k.org,
	linux-m68k@vger.kernel.org, takata@linux-m32r.org,
	linux-m32r@ml.linux-m32r.org, linux-kernel@vger.kernel.org
Cc: gorcunov@gmail.com, sam@ravnborg.org
Subject: [RFC 10/10] xtensa: vmlinux.lds.S - use PAGE_SIZE, THREAD_SIZE macroses
Date: Wed, 27 Feb 2008 23:58:41 +0300	[thread overview]
Message-ID: <20080227210004.611037191@gmail.com> (raw)
In-Reply-To: <20080227205831.150784453@gmail.com>

[-- 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 = .;

-- 

  parent reply	other threads:[~2008-02-27 21:03 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-27 20:58 [RFC 00/10] vmlinux.lds cleanup gorcunov
2008-02-27 20:58 ` [RFC 01/10] arm: vmlinux.lds.S cleanup - use PERCPU, PAGE_SIZE macroses gorcunov
2008-02-27 20:58 ` [RFC 02/10] m32r: vmlinux.lds.S cleanup - use PAGE_SIZE, THREAD_SIZE macroses gorcunov
2008-02-27 20:58 ` [RFC 03/10] m68k: vmlinux-std/sun3.lds.S cleanup - use PAGE_SIZE macro gorcunov
2008-02-28  8:56   ` Geert Uytterhoeven
2008-02-27 20:58 ` [RFC 04/10] m68knommu: vmlinux.lds " gorcunov
2008-02-27 20:58 ` [RFC 05/10] mn10300: vmlinux.lds.S cleanup - use PAGE_SIZE, PERCPU macroses gorcunov
2008-02-27 20:58 ` [RFC 06/10] powerpc: vmlinux.lds.S cleanup - use PERCPU, THREAD_SIZE macroses gorcunov
2008-02-27 20:58 ` [RFC 07/10] ppc: vmlinux.lds.S cleanup - use PAGE_SIZE macro gorcunov
2008-02-27 20:58 ` [RFC 08/10] um: dyn/uml.lds.S " gorcunov
2008-02-29 15:43   ` Jeff Dike
2008-03-01 15:35     ` Cyrill Gorcunov
2008-02-27 20:58 ` [RFC 09/10] alpha: vmlinux.lds cleanup - use THREAD_SIZE macro gorcunov
2008-02-27 20:58 ` gorcunov [this message]
2008-02-28 12:50 ` [RFC 05/10] mn10300: vmlinux.lds.S cleanup - use PAGE_SIZE, PERCPU macroses David Howells

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080227210004.611037191@gmail.com \
    --to=gorcunov@gmail.com \
    --cc=chris@zankel.net \
    --cc=dhowells@redhat.com \
    --cc=geert@linux-m68k.org \
    --cc=jdike@addtoit.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-m32r@ml.linux-m32r.org \
    --cc=linux-m68k@vger.kernel.org \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=paulus@samba.org \
    --cc=rth@twiddle.net \
    --cc=sam@ravnborg.org \
    --cc=takata@linux-m32r.org \
    --cc=zippel@linux-m68k.org \
    --subject='Re: [RFC 10/10] xtensa: vmlinux.lds.S - use PAGE_SIZE, THREAD_SIZE macroses' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).