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 branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
vmlinux.lds.S
diff --git
a/arch/x86/kernel/vmlinux.lds.S
b/arch/x86/kernel/vmlinux.lds.S
index
e03530a
..
bf47007
100644
(file)
--- a/
arch/x86/kernel/vmlinux.lds.S
+++ b/
arch/x86/kernel/vmlinux.lds.S
@@
-69,7
+69,7
@@
jiffies_64 = jiffies;
PHDRS {
text PT_LOAD FLAGS(5); /* R_E */
PHDRS {
text PT_LOAD FLAGS(5); /* R_E */
- data PT_LOAD FLAGS(
7); /* RWE
*/
+ data PT_LOAD FLAGS(
6); /* RW_
*/
#ifdef CONFIG_X86_64
user PT_LOAD FLAGS(5); /* R_E */
#ifdef CONFIG_SMP
#ifdef CONFIG_X86_64
user PT_LOAD FLAGS(5); /* R_E */
#ifdef CONFIG_SMP
@@
-116,6
+116,10
@@
SECTIONS
EXCEPTION_TABLE(16) :text = 0x9090
EXCEPTION_TABLE(16) :text = 0x9090
+#if defined(CONFIG_DEBUG_RODATA)
+ /* .text should occupy whole number of pages */
+ . = ALIGN(PAGE_SIZE);
+#endif
X64_ALIGN_DEBUG_RODATA_BEGIN
RO_DATA(PAGE_SIZE)
X64_ALIGN_DEBUG_RODATA_END
X64_ALIGN_DEBUG_RODATA_BEGIN
RO_DATA(PAGE_SIZE)
X64_ALIGN_DEBUG_RODATA_END
@@
-335,7
+339,7
@@
SECTIONS
__bss_start = .;
*(.bss..page_aligned)
*(.bss)
__bss_start = .;
*(.bss..page_aligned)
*(.bss)
- . = ALIGN(
4
);
+ . = ALIGN(
PAGE_SIZE
);
__bss_stop = .;
}
__bss_stop = .;
}