diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-12 10:53:44 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-12 10:53:44 +1100 |
| commit | 1b61f639aef75567f39090fd5db39ba639e18645 (patch) | |
| tree | e7e51d20292c5f8238fc29cd21257aaf5af99495 /fs | |
| parent | cdc6cfc84a9733c918f79967dda7bc2f13dcd70c (diff) | |
| parent | 59c7835794c222023567fec13bb2a427190e34e6 (diff) | |
Merge remote branch 'm68knommu/for-next'
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/binfmt_flat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c index e0e769bdca59..49566c1687d8 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; } |