[CRIU] [RFC v2 5/7] powerpc: Rename context.vdso_base to context.vdso

[Michael Ellerman]

Christopher Covington <cov at codeaurora.org> writes:

> Checkpoint/Restore In Userspace (CRIU) needs to be able to unmap and remap
> the VDSO to successfully checkpoint and restore applications in the face of
> changing VDSO addresses due to Address Space Layout Randomization (ASLR,
> randmaps). x86 and PowerPC have had architecture-specific code to support
> this. In order to expand the architectures that support this without
> unnecessary duplication of code, a generic version based on the PowerPC code
> was created. It differs slightly, based on the results of an informal
> survey of all architectures that indicated
>
> 	unsigned long vdso;
>
> is popular (and it's also concise). Therefore, change the variable name in
> powerpc from mm->context.vdso_base to mm->context.vdso.
>
> Signed-off-by: Christopher Covington <cov at codeaurora.org>
> ---
>  arch/powerpc/include/asm/book3s/32/mmu-hash.h |  2 +-
>  arch/powerpc/include/asm/book3s/64/mmu.h      |  2 +-
>  arch/powerpc/include/asm/mm-arch-hooks.h      |  6 +++---
>  arch/powerpc/include/asm/mmu-40x.h            |  2 +-
>  arch/powerpc/include/asm/mmu-44x.h            |  2 +-
>  arch/powerpc/include/asm/mmu-8xx.h            |  2 +-
>  arch/powerpc/include/asm/mmu-book3e.h         |  2 +-
>  arch/powerpc/include/asm/mmu_context.h        |  4 ++--
>  arch/powerpc/include/asm/vdso.h               |  2 +-
>  arch/powerpc/include/uapi/asm/elf.h           |  2 +-
>  arch/powerpc/kernel/signal_32.c               |  8 ++++----
>  arch/powerpc/kernel/signal_64.c               |  4 ++--
>  arch/powerpc/kernel/vdso.c                    |  8 ++++----
>  arch/powerpc/perf/callchain.c                 | 12 ++++++------
>  14 files changed, 29 insertions(+), 29 deletions(-)

This is kind of annoying, but I guess it's worth doing.

It's going to conflict like hell though. Who were you thinking would
merge this series? I think it should go via Andrew Morton's tree, as
that way if we get bad conflicts we can pull it out and redo it.

Assuming we agree on that I'm happy to ack it:

Acked-by: Michael Ellerman <mpe at ellerman.id.au> (powerpc)

cheers