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/parisc/kernel | |
| 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/parisc/kernel')
| -rw-r--r-- | arch/parisc/kernel/vmlinux.lds.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S index 2e516b871752..1a3b6ccd3620 100644 --- a/arch/parisc/kernel/vmlinux.lds.S +++ b/arch/parisc/kernel/vmlinux.lds.S | |||
| @@ -67,7 +67,6 @@ SECTIONS | |||
| 67 | _etext = .; | 67 | _etext = .; |
| 68 | 68 | ||
| 69 | RODATA | 69 | RODATA |
| 70 | BUG_TABLE | ||
| 71 | 70 | ||
| 72 | /* writeable */ | 71 | /* writeable */ |
| 73 | /* Make sure this is page aligned so | 72 | /* Make sure this is page aligned so |