summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-02-26 18:29:17 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-02-26 18:29:17 +1100
commit3d98ffbffb16f2a1569b83cb78db0b5100e6c937 (patch)
tree3604899600b8ce7c95d67b9299e1fb6b91005773 /arch/powerpc/include/asm
parent874f2f997dbe041a6c6e509dae8656ed9022d65d (diff)
downloadlinux-3d98ffbffb16f2a1569b83cb78db0b5100e6c937.tar.gz
linux-3d98ffbffb16f2a1569b83cb78db0b5100e6c937.tar.bz2
linux-3d98ffbffb16f2a1569b83cb78db0b5100e6c937.zip
powerpc: Fix lwsync feature fixup vs. modules on 64-bit
Anton's commit enabling the use of the lwsync fixup mechanism on 64-bit breaks modules. The lwsync fixup section uses .long instead of the FTR_ENTRY_OFFSET macro used by other fixups sections, and thus will generate 32-bit relocations that our module loader cannot resolve. This changes it to use the same type as other feature sections. Note however that we might want to consider using 32-bit for all the feature fixup offsets and add support for R_PPC_REL32 to module_64.c instead as that would reduce the size of the kernel image. I'll leave that as an exercise for the reader for now... Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/include/asm')
-rw-r--r--arch/powerpc/include/asm/feature-fixups.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/feature-fixups.h b/arch/powerpc/include/asm/feature-fixups.h
index cbd4dfa4bce2..96a7d067fbb2 100644
--- a/arch/powerpc/include/asm/feature-fixups.h
+++ b/arch/powerpc/include/asm/feature-fixups.h
@@ -165,7 +165,7 @@ label##2: \
.pushsection sect,"a"; \
.align 2; \
label##3: \
- .long label##1b-label##3b; \
+ FTR_ENTRY_OFFSET label##1b-label##3b; \
.popsection;
#endif /* __ASM_POWERPC_FEATURE_FIXUPS_H */