git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86
[pandora-kernel.git]
/
arch
/
um
/
kernel
/
uml.lds.S
diff --git
a/arch/um/kernel/uml.lds.S
b/arch/um/kernel/uml.lds.S
index
f630127
..
13df191
100644
(file)
--- a/
arch/um/kernel/uml.lds.S
+++ b/
arch/um/kernel/uml.lds.S
@@
-18,13
+18,6
@@
SECTIONS
. = START + SIZEOF_HEADERS;
. = START + SIZEOF_HEADERS;
-#ifdef MODE_TT
- .remap_data : { UNMAP_PATH (.data .bss) }
- .remap : { UNMAP_PATH (.text) }
-
- . = ALIGN(4096); /* Init code and data */
-#endif
-
_text = .;
_stext = .;
__init_begin = .;
_text = .;
_stext = .;
__init_begin = .;
@@
-37,19
+30,20
@@
SECTIONS
.text :
{
.text :
{
- *(.text)
+ TEXT_TEXT
SCHED_TEXT
LOCK_TEXT
*(.fixup)
/* .gnu.warning sections are handled specially by elf32.em. */
*(.gnu.warning)
*(.gnu.linkonce.t*)
SCHED_TEXT
LOCK_TEXT
*(.fixup)
/* .gnu.warning sections are handled specially by elf32.em. */
*(.gnu.warning)
*(.gnu.linkonce.t*)
+ }
-
. = ALIGN(4096);
- __syscall_stub_start = .;
- *(.__syscall_stub*)
- __syscall_stub_end = .;
-
. = ALIGN(4096)
;
+ . = ALIGN(4096);
+ .syscall_stub : {
+ __syscall_stub_start = .;
+ *(.__syscall_stub*)
+
__syscall_stub_end = .
;
}
#include "asm/common.lds.S"
}
#include "asm/common.lds.S"
@@
-59,7
+53,9
@@
SECTIONS
{
. = ALIGN(KERNEL_STACK_SIZE); /* init_task */
*(.data.init_task)
{
. = ALIGN(KERNEL_STACK_SIZE); /* init_task */
*(.data.init_task)
- *(.data)
+ . = ALIGN(KERNEL_STACK_SIZE);
+ *(.data.init_irqstack)
+ DATA_DATA
*(.gnu.linkonce.d*)
CONSTRUCTORS
}
*(.gnu.linkonce.d*)
CONSTRUCTORS
}