diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-26 18:06:06 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-26 18:06:06 -0400 |
| commit | aef7b83c92dd0b7e994805440655d1d64147287b (patch) | |
| tree | 981f373358c1988e061625e8f272013065cb086f /arch/ia64/kernel/module.c | |
| parent | b1fc5505e0dbcc3fd7c75bfe6bee39ec50080963 (diff) | |
| parent | 8678887e7fb43cd6c9be6c9807b05e77848e0920 (diff) | |
| download | kernel-crypto-aef7b83c92dd0b7e994805440655d1d64147287b.tar.gz kernel-crypto-aef7b83c92dd0b7e994805440655d1d64147287b.tar.xz kernel-crypto-aef7b83c92dd0b7e994805440655d1d64147287b.zip | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/ia64/kernel/module.c')
| -rw-r--r-- | arch/ia64/kernel/module.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c index febc091c2f0..f1aca7cffd1 100644 --- a/arch/ia64/kernel/module.c +++ b/arch/ia64/kernel/module.c @@ -825,14 +825,16 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind * XXX Should have an arch-hook for running this after final section * addresses have been selected... */ - /* See if gp can cover the entire core module: */ - uint64_t gp = (uint64_t) mod->module_core + MAX_LTOFF / 2; - if (mod->core_size >= MAX_LTOFF) + uint64_t gp; + if (mod->core_size > MAX_LTOFF) /* * This takes advantage of fact that SHF_ARCH_SMALL gets allocated * at the end of the module. */ - gp = (uint64_t) mod->module_core + mod->core_size - MAX_LTOFF / 2; + gp = mod->core_size - MAX_LTOFF / 2; + else + gp = mod->core_size / 2; + gp = (uint64_t) mod->module_core + ((gp + 7) & -8); mod->arch.gp = gp; DEBUGP("%s: placing gp at 0x%lx\n", __FUNCTION__, gp); } |