diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 18:28:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 18:28:10 -0400 |
| commit | d18bb9a548e550f3ced57618e75085fb3f173133 (patch) | |
| tree | ea6be1655c55422cb5a1df84ae08f150b60e6808 /arch/x86/kernel/vmlinux_32.lds.S | |
| parent | 4bb0057f996b1491f93a64879f4c53c83bc0f0c7 (diff) | |
| parent | 6d72b7952fa7d7c61d021398970c29afde6a4443 (diff) | |
Merge branch 'core/rodata' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core/rodata' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
move BUG_TABLE into RODATA
Diffstat (limited to 'arch/x86/kernel/vmlinux_32.lds.S')
| -rw-r--r-- | arch/x86/kernel/vmlinux_32.lds.S | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86/kernel/vmlinux_32.lds.S b/arch/x86/kernel/vmlinux_32.lds.S index 2674f5796275..cdb2363697d2 100644 --- a/arch/x86/kernel/vmlinux_32.lds.S +++ b/arch/x86/kernel/vmlinux_32.lds.S | |||
| @@ -49,16 +49,14 @@ SECTIONS | |||
| 49 | _etext = .; /* End of text section */ | 49 | _etext = .; /* End of text section */ |
| 50 | } :text = 0x9090 | 50 | } :text = 0x9090 |
| 51 | 51 | ||
| 52 | NOTES :text :note | ||
| 53 | |||
| 52 | . = ALIGN(16); /* Exception table */ | 54 | . = ALIGN(16); /* Exception table */ |
| 53 | __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { | 55 | __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { |
| 54 | __start___ex_table = .; | 56 | __start___ex_table = .; |
| 55 | *(__ex_table) | 57 | *(__ex_table) |
| 56 | __stop___ex_table = .; | 58 | __stop___ex_table = .; |
| 57 | } | 59 | } :text = 0x9090 |
| 58 | |||
| 59 | NOTES :text :note | ||
| 60 | |||
| 61 | BUG_TABLE :text | ||
| 62 | 60 | ||
| 63 | RODATA | 61 | RODATA |
| 64 | 62 | ||