git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
vmlinux.lds.S
diff --git
a/arch/i386/kernel/vmlinux.lds.S
b/arch/i386/kernel/vmlinux.lds.S
index
8831303
..
1e7ac1c
100644
(file)
--- a/
arch/i386/kernel/vmlinux.lds.S
+++ b/
arch/i386/kernel/vmlinux.lds.S
@@
-13,6
+13,12
@@
OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
OUTPUT_ARCH(i386)
ENTRY(phys_startup_32)
jiffies = jiffies_64;
OUTPUT_ARCH(i386)
ENTRY(phys_startup_32)
jiffies = jiffies_64;
+
+PHDRS {
+ text PT_LOAD FLAGS(5); /* R_E */
+ data PT_LOAD FLAGS(7); /* RWE */
+ note PT_NOTE FLAGS(4); /* R__ */
+}
SECTIONS
{
. = __KERNEL_START;
SECTIONS
{
. = __KERNEL_START;
@@
-26,7
+32,7
@@
SECTIONS
KPROBES_TEXT
*(.fixup)
*(.gnu.warning)
KPROBES_TEXT
*(.fixup)
*(.gnu.warning)
- } = 0x9090
+ }
:text
= 0x9090
_etext = .; /* End of text section */
_etext = .; /* End of text section */
@@
-37,11
+43,18
@@
SECTIONS
RODATA
RODATA
+ . = ALIGN(4);
+ __tracedata_start = .;
+ .tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) {
+ *(.tracedata)
+ }
+ __tracedata_end = .;
+
/* writeable */
.data : AT(ADDR(.data) - LOAD_OFFSET) { /* Data */
*(.data)
CONSTRUCTORS
/* writeable */
.data : AT(ADDR(.data) - LOAD_OFFSET) { /* Data */
*(.data)
CONSTRUCTORS
- }
+ }
:data
. = ALIGN(4096);
__nosave_begin = .;
. = ALIGN(4096);
__nosave_begin = .;
@@
-64,6
+77,15
@@
SECTIONS
.data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET) { *(.data.read_mostly) }
_edata = .; /* End of data section */
.data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET) { *(.data.read_mostly) }
_edata = .; /* End of data section */
+#ifdef CONFIG_STACK_UNWIND
+ . = ALIGN(4);
+ .eh_frame : AT(ADDR(.eh_frame) - LOAD_OFFSET) {
+ __start_unwind = .;
+ *(.eh_frame)
+ __end_unwind = .;
+ }
+#endif
+
. = ALIGN(THREAD_SIZE); /* init_task */
.data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) {
*(.data.init_task)
. = ALIGN(THREAD_SIZE); /* init_task */
.data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) {
*(.data.init_task)
@@
-168,4
+190,6
@@
SECTIONS
STABS_DEBUG
DWARF_DEBUG
STABS_DEBUG
DWARF_DEBUG
+
+ NOTES
}
}