summaryrefslogtreecommitdiffstats
path: root/arch/arm/vmlinux-armv.lds.in
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-10-05 01:18:40 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-10-05 01:18:40 +0000
commit012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch)
tree87efc733f9b164e8c85c0336f92c8fb7eff6d183 /arch/arm/vmlinux-armv.lds.in
parent625a1589d3d6464b5d90b8a0918789e3afffd220 (diff)
Merge with Linux 2.4.0-test9. Please check DECstation, I had a number
of rejects to fixup while integrating Linus patches. I also found that this kernel will only boot SMP on Origin; the UP kernel freeze soon after bootup with SCSI timeout messages. I commit this anyway since I found that the last CVS versions had the same problem.
Diffstat (limited to 'arch/arm/vmlinux-armv.lds.in')
-rw-r--r--arch/arm/vmlinux-armv.lds.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/vmlinux-armv.lds.in b/arch/arm/vmlinux-armv.lds.in
index 4ef7377bb..b54f2bd92 100644
--- a/arch/arm/vmlinux-armv.lds.in
+++ b/arch/arm/vmlinux-armv.lds.in
@@ -42,8 +42,8 @@ SECTIONS
*(.text.lock) /* out-of-line lock text */
*(.rodata)
*(.kstrtab)
- . = ALIGN(16); /* Exception table */
- __start___ex_table = .;
+ . = ALIGN(16);
+ __start___ex_table = .; /* Exception table */
*(__ex_table)
__stop___ex_table = .;