Move kho_block.h to kho/block.h, organizing it within the existing kho directory structure as more KHO data structures are introduced.
This is a pure code movement patch; no logic or functional changes are introduced. Signed-off-by: Pasha Tatashin <[email protected]> --- Documentation/core-api/kho/index.rst | 2 +- MAINTAINERS | 1 - include/linux/{kho_block.h => kho/block.h} | 2 +- kernel/liveupdate/kho_block.c | 2 +- kernel/liveupdate/luo_internal.h | 2 +- kernel/liveupdate/luo_session.c | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) rename include/linux/{kho_block.h => kho/block.h} (100%) diff --git a/Documentation/core-api/kho/index.rst b/Documentation/core-api/kho/index.rst index a10b10700fb9..4a5477221fe4 100644 --- a/Documentation/core-api/kho/index.rst +++ b/Documentation/core-api/kho/index.rst @@ -95,7 +95,7 @@ KHO Serialization Blocks API .. kernel-doc:: kernel/liveupdate/kho_block.c :doc: KHO Serialization Blocks -.. kernel-doc:: include/linux/kho_block.h +.. kernel-doc:: include/linux/kho/block.h .. kernel-doc:: kernel/liveupdate/kho_block.c :internal: diff --git a/MAINTAINERS b/MAINTAINERS index 920ba7622afa..9ec290e38b44 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14208,7 +14208,6 @@ F: Documentation/admin-guide/mm/kho.rst F: Documentation/core-api/kho/* F: include/linux/kexec_handover.h F: include/linux/kho/ -F: include/linux/kho_block.h F: kernel/liveupdate/kexec_handover* F: lib/test_kho.c F: tools/testing/selftests/kho/ diff --git a/include/linux/kho_block.h b/include/linux/kho/block.h similarity index 100% rename from include/linux/kho_block.h rename to include/linux/kho/block.h index 93a7cc2be5f5..2b9d5a080a6a 100644 --- a/include/linux/kho_block.h +++ b/include/linux/kho/block.h @@ -7,9 +7,9 @@ #ifndef _LINUX_KHO_BLOCK_H #define _LINUX_KHO_BLOCK_H +#include <linux/kho/abi/block.h> #include <linux/list.h> #include <linux/types.h> -#include <linux/kho/abi/block.h> /** * struct kho_block - Internal representation of a serialization block. diff --git a/kernel/liveupdate/kho_block.c b/kernel/liveupdate/kho_block.c index 0d2a342ef422..6cedcd36bfd2 100644 --- a/kernel/liveupdate/kho_block.c +++ b/kernel/liveupdate/kho_block.c @@ -23,7 +23,7 @@ #include <linux/io.h> #include <linux/kexec_handover.h> #include <linux/kho/abi/block.h> -#include <linux/kho_block.h> +#include <linux/kho/block.h> #include <linux/slab.h> /* diff --git a/kernel/liveupdate/luo_internal.h b/kernel/liveupdate/luo_internal.h index 64879ffe7378..349f6d141873 100644 --- a/kernel/liveupdate/luo_internal.h +++ b/kernel/liveupdate/luo_internal.h @@ -8,9 +8,9 @@ #ifndef _LINUX_LUO_INTERNAL_H #define _LINUX_LUO_INTERNAL_H +#include <linux/kho/block.h> #include <linux/liveupdate.h> #include <linux/uaccess.h> -#include <linux/kho_block.h> struct luo_ucmd { void __user *ubuffer; diff --git a/kernel/liveupdate/luo_session.c b/kernel/liveupdate/luo_session.c index b79b2a488974..01c0ccf09919 100644 --- a/kernel/liveupdate/luo_session.c +++ b/kernel/liveupdate/luo_session.c @@ -90,8 +90,8 @@ #include <linux/fs.h> #include <linux/io.h> #include <linux/kexec_handover.h> -#include <linux/kho_block.h> #include <linux/kho/abi/luo.h> +#include <linux/kho/block.h> #include <linux/list.h> #include <linux/liveupdate.h> #include <linux/mutex.h> -- 2.53.0
