summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-21 12:33:12 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-21 12:33:12 -0700
commit1ef6ce7a340f9ed139a73147ff9cf7ad56889414 (patch)
treea77e01134ae46b79262dbf97614df7be920965f2 /fs
parent458f8c895beba63851281dcdac3773685f0fae09 (diff)
parent2545cf6e94b4eb5a2c48dd55751aa9a70ff1ff9d (diff)
downloadop-kernel-dev-1ef6ce7a340f9ed139a73147ff9cf7ad56889414.zip
op-kernel-dev-1ef6ce7a340f9ed139a73147ff9cf7ad56889414.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68knommu: allow 4 coldfire serial ports m68knommu: fix coldfire tcdrain m68knommu: remove a duplicate vector setting line for 68360 Fix m68k-uclinux's rt_sigreturn trampoline m68knommu: correct the CC flags for Coldfire M5272 targets uclinux: error message when FLAT reloc symbol is invalid, v2
Diffstat (limited to 'fs')
-rw-r--r--fs/binfmt_flat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
index e0e769b..49566c1 100644
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
@@ -355,7 +355,7 @@ calc_reloc(unsigned long r, struct lib_info *p, int curid, int internalp)
if (!flat_reloc_valid(r, start_brk - start_data + text_len)) {
printk("BINFMT_FLAT: reloc outside program 0x%x (0 - 0x%x/0x%x)",
- (int) r,(int)(start_brk-start_code),(int)text_len);
+ (int) r,(int)(start_brk-start_data+text_len),(int)text_len);
goto failed;
}
OpenPOWER on IntegriCloud