diff options
| author | James Morris <jmorris@macbook.(none)> | 2009-12-03 07:33:40 +0100 |
|---|---|---|
| committer | James Morris <jmorris@macbook.(none)> | 2009-12-03 07:33:40 +0100 |
| commit | c84d6efd363a3948eb32ec40d46bab6338580454 (patch) | |
| tree | 3ba7ac46e6626fe8ac843834588609eb6ccee5c6 /arch/m32r/kernel/vmlinux.lds.S | |
| parent | TOMOYO: Add recursive directory matching operator support. (diff) | |
| parent | Linux 2.6.32 (diff) | |
| download | linux-c84d6efd363a3948eb32ec40d46bab6338580454.tar.xz linux-c84d6efd363a3948eb32ec40d46bab6338580454.zip | |
Merge branch 'master' into next
Diffstat (limited to 'arch/m32r/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/m32r/kernel/vmlinux.lds.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m32r/kernel/vmlinux.lds.S b/arch/m32r/kernel/vmlinux.lds.S index 8ceb6181d805..7da94eaa082b 100644 --- a/arch/m32r/kernel/vmlinux.lds.S +++ b/arch/m32r/kernel/vmlinux.lds.S @@ -42,6 +42,8 @@ SECTIONS _etext = .; /* End of text section */ EXCEPTION_TABLE(16) + NOTES + RODATA RW_DATA_SECTION(32, PAGE_SIZE, THREAD_SIZE) _edata = .; /* End of data section */ |