Re: [PATCH v4 2/2] powerpc/kexec: move kexec files into a dedicated subdir.

[Christophe Leroy]

Michael Ellerman <m...@ellerman.id.au> a écrit :

Christophe Leroy <christophe.le...@c-s.fr> writes:

arch/powerpc/kernel/ contains 8 files dedicated to kexec.

Move them into a dedicated subdirectory.

Signed-off-by: Christophe Leroy <christophe.le...@c-s.fr>

---
v2: moved crash.c as well as it's part of kexec suite.
v3: renamed files to remove 'kexec' keyword from names.
v4: removed a ifdef in kexec/Makefile
---
 arch/powerpc/kernel/Makefile                       | 19 +---------------

arch/powerpc/kernel/kexec/Makefile | 25 ++++++++++++++++++++++

 arch/powerpc/kernel/{ => kexec}/crash.c            |  0
 .../kernel/{kexec_elf_64.c => kexec/elf_64.c}      |  0
 arch/powerpc/kernel/{ima_kexec.c => kexec/ima.c}   |  0
 .../kernel/{machine_kexec.c => kexec/machine.c}    |  0
 .../{machine_kexec_32.c => kexec/machine_32.c}     |  0
 .../{machine_kexec_64.c => kexec/machine_64.c}     |  0
 .../machine_file_64.c}                             |  0
 .../{kexec_relocate_32.S => kexec/relocate_32.S}   |  2 +-
 10 files changed, 27 insertions(+), 19 deletions(-)
 create mode 100644 arch/powerpc/kernel/kexec/Makefile
 rename arch/powerpc/kernel/{ => kexec}/crash.c (100%)
 rename arch/powerpc/kernel/{kexec_elf_64.c => kexec/elf_64.c} (100%)
 rename arch/powerpc/kernel/{ima_kexec.c => kexec/ima.c} (100%)
 rename arch/powerpc/kernel/{machine_kexec.c => kexec/machine.c} (100%)

rename arch/powerpc/kernel/{machine_kexec_32.c => kexec/machine_32.c} (100%) rename arch/powerpc/kernel/{machine_kexec_64.c => kexec/machine_64.c} (100%) rename arch/powerpc/kernel/{machine_kexec_file_64.c => kexec/machine_file_64.c} (100%) rename arch/powerpc/kernel/{kexec_relocate_32.S => kexec/relocate_32.S} (99%)

I'm inclined to move the directory out of kernel, ie. up a level with mm
and so on.

And I also don't think the "machine" naming is useful anymore. It comes
from the naming of the arch functions, eg. machine_kexec(), which was
named to be analogous to machine_restart().

So how about:

  arch/powerpc/{kernel/machine_kexec.c => kexec/core.c}
  arch/powerpc/{kernel/machine_kexec_32.c => kexec/core_32.c}
  arch/powerpc/{kernel/machine_kexec_64.c => kexec/core_64.c}
  arch/powerpc/{kernel => kexec}/crash.c
  arch/powerpc/{kernel/kexec_elf_64.c => kexec/elf_64.c}
  arch/powerpc/{kernel/machine_kexec_file_64.c => kexec/file_load.c}
  arch/powerpc/{kernel/ima_kexec.c => kexec/ima.c}
  arch/powerpc/{kernel/kexec_relocate_32.S => kexec/relocate_32.S}

And we end up with:

  $ find arch/powerpc/kexec
  arch/powerpc/kexec/
  arch/powerpc/kexec/file_load.c
  arch/powerpc/kexec/relocate_32.S
  arch/powerpc/kexec/core_64.c
  arch/powerpc/kexec/ima.c
  arch/powerpc/kexec/core.c
  arch/powerpc/kexec/core_32.c
  arch/powerpc/kexec/Makefile
  arch/powerpc/kexec/crash.c
  arch/powerpc/kexec/elf_64.c

That looks good

Christophe