diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-10-19 21:47:18 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-10-24 21:54:07 -0400 |
commit | 0909c8c2d547e45ca50e2492b08ec93a37b35237 (patch) | |
tree | 23e66e1dc9a5bd674ba1375b5fccd2cb0d5787a8 /arch/powerpc/kernel/setup_64.c | |
parent | 7aeb732428fc8e2ecae6d432873770c12f04a979 (diff) |
[POWERPC] Support feature fixups in vdso's
This patch reworks the feature fixup mecanism so vdso's can be fixed up.
The main issue was that the construct:
.long label (or .llong on 64 bits)
will not work in the case of a shared library like the vdso. It will
generate an empty placeholder in the fixup table along with a reloc,
which is not something we can deal with in the vdso.
The idea here (thanks Alan Modra !) is to instead use something like:
1:
.long label - 1b
That is, the feature fixup tables no longer contain addresses of bits of
code to patch, but offsets of such code from the fixup table entry
itself. That is properly resolved by ld when building the .so's. I've
modified the fixup mecanism generically to use that method for the rest
of the kernel as well.
Another trick is that the 32 bits vDSO included in the 64 bits kernel
need to have a table in the 64 bits format. However, gas does not
support 32 bits code with a statement of the form:
.llong label - 1b (Or even just .llong label)
That is, it cannot emit the right fixup/relocation for the linker to use
to assign a 32 bits address to an .llong field. Thus, in the specific
case of the 32 bits vdso built as part of the 64 bits kernel, we are
using a modified macro that generates:
.long 0xffffffff
.llong label - 1b
Note that is assumes that the value is negative which is enforced by
the .lds (those offsets are always negative as the .text is always
before the fixup table and gas doesn't support emiting the reloc the
other way around).
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/setup_64.c')
-rw-r--r-- | arch/powerpc/kernel/setup_64.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 1969b5686eee..16278968dab6 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c | |||
@@ -354,9 +354,9 @@ void __init setup_system(void) | |||
354 | /* Apply the CPUs-specific and firmware specific fixups to kernel | 354 | /* Apply the CPUs-specific and firmware specific fixups to kernel |
355 | * text (nop out sections not relevant to this CPU or this firmware) | 355 | * text (nop out sections not relevant to this CPU or this firmware) |
356 | */ | 356 | */ |
357 | do_feature_fixups(0, cur_cpu_spec->cpu_features, | 357 | do_feature_fixups(cur_cpu_spec->cpu_features, |
358 | &__start___ftr_fixup, &__stop___ftr_fixup); | 358 | &__start___ftr_fixup, &__stop___ftr_fixup); |
359 | do_feature_fixups(0, powerpc_firmware_features, | 359 | do_feature_fixups(powerpc_firmware_features, |
360 | &__start___fw_ftr_fixup, &__stop___fw_ftr_fixup); | 360 | &__start___fw_ftr_fixup, &__stop___fw_ftr_fixup); |
361 | 361 | ||
362 | /* | 362 | /* |