From: Tim Abbott <tabbott@ksplice.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, Sam Ravnborg <sam@ravnborg.org>,
Tim Abbott <tabbott@ksplice.com>,
Kyle McMartin <kyle@mcmartin.ca>, Helge Deller <deller@gmx.de>,
linux-parisc@vger.kernel.org
Subject: [PATCH 08/13] parisc: Clean up linker script using new linker script macros.
Date: Tue, 22 Sep 2009 10:22:22 -0400 [thread overview]
Message-ID: <1253629347-23119-9-git-send-email-tabbott@ksplice.com> (raw)
In-Reply-To: <1253629347-23119-1-git-send-email-tabbott@ksplice.com>
This patch has the (likely harmless) side effect of moving
.data.init_task inside the _edata.
It also changes the alignment of .data.init_task from 16384 to
THREAD_SIZE, which can in some configurations be larger than 16384. I
believe that this change fixes a potential bug on those
configurations.
Signed-off-by: Tim Abbott <tabbott@ksplice.com>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Helge Deller <deller@gmx.de>
Cc: linux-parisc@vger.kernel.org
Acked-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/parisc/kernel/vmlinux.lds.S | 79 ++------------------------------------
1 files changed, 4 insertions(+), 75 deletions(-)
diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S
index aea1784..3fd66d9 100644
--- a/arch/parisc/kernel/vmlinux.lds.S
+++ b/arch/parisc/kernel/vmlinux.lds.S
@@ -77,13 +77,7 @@ SECTIONS
*/
. = ALIGN(PAGE_SIZE);
data_start = .;
- . = ALIGN(16);
- /* Exception table */
- __ex_table : {
- __start___ex_table = .;
- *(__ex_table)
- __stop___ex_table = .;
- }
+ EXCEPTION_TABLE(16)
NOTES
@@ -94,23 +88,8 @@ SECTIONS
__stop___unwind = .;
}
- /* rarely changed data like cpu maps */
- . = ALIGN(16);
- .data.read_mostly : {
- *(.data.read_mostly)
- }
-
- . = ALIGN(L1_CACHE_BYTES);
/* Data */
- .data : {
- DATA_DATA
- CONSTRUCTORS
- }
-
- . = ALIGN(L1_CACHE_BYTES);
- .data.cacheline_aligned : {
- *(.data.cacheline_aligned)
- }
+ RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
/* PA-RISC locks requires 16-byte alignment */
. = ALIGN(16);
@@ -118,17 +97,6 @@ SECTIONS
*(.data.lock_aligned)
}
- /* nosave data is really only used for software suspend...it's here
- * just in case we ever implement it
- */
- . = ALIGN(PAGE_SIZE);
- __nosave_begin = .;
- .data_nosave : {
- *(.data.nosave)
- }
- . = ALIGN(PAGE_SIZE);
- __nosave_end = .;
-
/* End of data section */
_edata = .;
@@ -147,14 +115,6 @@ SECTIONS
}
__bss_stop = .;
-
- /* assembler code expects init_task to be 16k aligned */
- . = ALIGN(16384);
- /* init_task */
- .data.init_task : {
- *(.data.init_task)
- }
-
#ifdef CONFIG_64BIT
. = ALIGN(16);
/* Linkage tables */
@@ -172,31 +132,8 @@ SECTIONS
/* reserve space for interrupt stack by aligning __init* to 16k */
. = ALIGN(16384);
__init_begin = .;
- .init.text : {
- _sinittext = .;
- INIT_TEXT
- _einittext = .;
- }
- .init.data : {
- INIT_DATA
- }
- . = ALIGN(16);
- .init.setup : {
- __setup_start = .;
- *(.init.setup)
- __setup_end = .;
- }
- .initcall.init : {
- __initcall_start = .;
- INITCALLS
- __initcall_end = .;
- }
- .con_initcall.init : {
- __con_initcall_start = .;
- *(.con_initcall.init)
- __con_initcall_end = .;
- }
- SECURITY_INIT
+ INIT_TEXT_SECTION(16384)
+ INIT_DATA_SECTION(16)
/* alternate instruction replacement. This is a mechanism x86 uses
* to detect the CPU type and replace generic instruction sequences
@@ -222,14 +159,6 @@ SECTIONS
.exit.data : {
EXIT_DATA
}
-#ifdef CONFIG_BLK_DEV_INITRD
- . = ALIGN(PAGE_SIZE);
- .init.ramfs : {
- __initramfs_start = .;
- *(.init.ramfs)
- __initramfs_end = .;
- }
-#endif
PERCPU(PAGE_SIZE)
. = ALIGN(PAGE_SIZE);
--
1.6.3.3
next prev parent reply other threads:[~2009-09-22 14:23 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-22 14:22 [PATCH 00/13] Linker script cleanup patches for various architectures Tim Abbott
2009-09-22 14:22 ` [PATCH 01/13] Optimize the ordering of sections in RW_DATA_SECTION Tim Abbott
2009-09-23 18:26 ` Linus Torvalds
2009-09-23 18:36 ` Tim Abbott
2009-09-22 14:22 ` [PATCH 02/13] m32r: make PAGE_SIZE available to assembly Tim Abbott
2009-09-22 14:22 ` [PATCH 03/13] m32r: Define THREAD_SIZE only once Tim Abbott
2009-09-22 14:22 ` [PATCH 04/13] m32r: Move GET_THREAD_INFO definition out of asm/thread_info.h Tim Abbott
2009-09-22 14:22 ` [PATCH 05/13] m32r: Remove unused .altinstructions and .exit.* code from linker script Tim Abbott
2009-09-22 14:22 ` [PATCH 06/13] m32r: Move the spi_stack_top and spu_stack_top into .init.data section Tim Abbott
2009-09-22 14:22 ` [PATCH 07/13] m32r: Cleanup linker script using new linker script macros Tim Abbott
2009-09-22 14:22 ` Tim Abbott [this message]
2009-09-22 14:22 ` [PATCH 09/13] parisc: Remove useless altinstructions code copied from x86 Tim Abbott
2009-09-23 19:55 ` Kyle McMartin
2009-09-22 14:22 ` [PATCH 10/13] xtensa: Cleanup linker script using new linker script macros Tim Abbott
2009-09-22 14:22 ` [PATCH 11/13] um: Clean up linker script using standard macros Tim Abbott
2009-09-22 14:22 ` [PATCH 12/13] h8300: Cleanup linker script using new linker script macros Tim Abbott
2009-09-22 14:22 ` [PATCH 13/13] mn10300: Clean up linker script using higher-level macros Tim Abbott
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=1253629347-23119-9-git-send-email-tabbott@ksplice.com \
--to=tabbott@ksplice.com \
--cc=deller@gmx.de \
--cc=kyle@mcmartin.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=sam@ravnborg.org \
--cc=torvalds@linux-foundation.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®