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/sh | |
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/sh')
-rw-r--r-- | arch/sh/kernel/vmlinux_32.lds.S | 1 | ||||
-rw-r--r-- | arch/sh/kernel/vmlinux_64.lds.S | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/sh/kernel/vmlinux_32.lds.S b/arch/sh/kernel/vmlinux_32.lds.S index c7113786ecd4..7b4b82bd1156 100644 --- a/arch/sh/kernel/vmlinux_32.lds.S +++ b/arch/sh/kernel/vmlinux_32.lds.S | |||
@@ -44,7 +44,6 @@ SECTIONS | |||
44 | 44 | ||
45 | _etext = .; /* End of text section */ | 45 | _etext = .; /* End of text section */ |
46 | 46 | ||
47 | BUG_TABLE | ||
48 | NOTES | 47 | NOTES |
49 | RO_DATA(PAGE_SIZE) | 48 | RO_DATA(PAGE_SIZE) |
50 | 49 | ||
diff --git a/arch/sh/kernel/vmlinux_64.lds.S b/arch/sh/kernel/vmlinux_64.lds.S index d1e177009a41..33fa46451406 100644 --- a/arch/sh/kernel/vmlinux_64.lds.S +++ b/arch/sh/kernel/vmlinux_64.lds.S | |||
@@ -65,7 +65,6 @@ SECTIONS | |||
65 | 65 | ||
66 | _etext = .; /* End of text section */ | 66 | _etext = .; /* End of text section */ |
67 | 67 | ||
68 | BUG_TABLE | ||
69 | NOTES | 68 | NOTES |
70 | RO_DATA(PAGE_SIZE) | 69 | RO_DATA(PAGE_SIZE) |
71 | 70 | ||