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 branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release
[pandora-kernel.git]
/
arch
/
blackfin
/
kernel
/
vmlinux.lds.S
diff --git
a/arch/blackfin/kernel/vmlinux.lds.S
b/arch/blackfin/kernel/vmlinux.lds.S
index
eec4367
..
8587224
100644
(file)
--- a/
arch/blackfin/kernel/vmlinux.lds.S
+++ b/
arch/blackfin/kernel/vmlinux.lds.S
@@
-91,13
+91,13
@@
SECTIONS
{
. = ALIGN(PAGE_SIZE);
__sinittext = .;
{
. = ALIGN(PAGE_SIZE);
__sinittext = .;
- *(.init.text)
+ INIT_TEXT
__einittext = .;
}
.init.data :
{
. = ALIGN(16);
__einittext = .;
}
.init.data :
{
. = ALIGN(16);
- *(.init.data)
+ INIT_DATA
}
.init.setup :
{
}
.init.setup :
{
@@
-172,9
+172,14
@@
SECTIONS
__ebss_b_l1 = .;
}
__ebss_b_l1 = .;
}
- ___init_end = LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1);
+ /* Force trailing alignment of our init section so that when we
+ * free our init memory, we don't leave behind a partial page.
+ */
+ . = LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1);
+ . = ALIGN(PAGE_SIZE);
+ ___init_end = .;
- .bss
LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1)
:
+ .bss :
{
. = ALIGN(4);
___bss_start = .;
{
. = ALIGN(4);
___bss_start = .;
@@
-193,8
+198,8
@@
SECTIONS
/DISCARD/ :
{
/DISCARD/ :
{
- *(.exit.text)
- *(.exit.data)
+ EXIT_TEXT
+ EXIT_DATA
*(.exitcall.exit)
}
}
*(.exitcall.exit)
}
}