euleros inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I7RO5Q Reference: https://gitee.com/openeuler/kernel/commit/aa7f1d222cdab88f12e6d889437fed6571...
-------------------------------------------------
The original memory extension feature name is memig, after open source the feature name is changed to etmem.
This patch is used to synchronously modify the feature name and file name.
The config options and the file name are modified synchronously to etmem.
Signed-off-by: liubo liubo254@huawei.com Reviewed-by: geruijun geruijun@huawei.com Reviewed-by: Xiongfeng Wang wangxiongfeng2@huawei.com Signed-off-by: Zheng Zengkai zhengzengkai@huawei.com --- arch/arm64/configs/openeuler_defconfig | 4 ++-- arch/x86/configs/openeuler_defconfig | 4 ++-- fs/proc/Makefile | 4 ++-- fs/proc/{memig_scan.c => etmem_scan.c} | 2 +- fs/proc/{memig_scan.h => etmem_scan.h} | 0 fs/proc/{memig_swap.c => etmem_swap.c} | 0 lib/Kconfig | 12 ++++++------ 7 files changed, 13 insertions(+), 13 deletions(-) rename fs/proc/{memig_scan.c => etmem_scan.c} (99%) rename fs/proc/{memig_scan.h => etmem_scan.h} (100%) rename fs/proc/{memig_swap.c => etmem_swap.c} (100%)
diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 233e736bf6f1..16cad3fb2744 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -7810,8 +7810,8 @@ CONFIG_FUNCTION_ERROR_INJECTION=y CONFIG_ARCH_HAS_KCOV=y # CONFIG_RUNTIME_TESTING_MENU is not set CONFIG_ARCH_USE_MEMTEST=y -CONFIG_MEMIG_SCAN=m -CONFIG_MEMIG_SWAP=m +CONFIG_ETMEM_SCAN=m +CONFIG_ETMEM_SWAP=m # CONFIG_MEMTEST is not set # end of Kernel Testing and Coverage
diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index f2ae112791cb..4f9945502961 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -9046,8 +9046,8 @@ CONFIG_ARCH_HAS_KCOV=y # CONFIG_KCOV is not set # CONFIG_RUNTIME_TESTING_MENU is not set CONFIG_ARCH_USE_MEMTEST=y -CONFIG_MEMIG_SCAN=m -CONFIG_MEMIG_SWAP=m +CONFIG_ETMEM_SCAN=m +CONFIG_ETMEM_SWAP=m # CONFIG_MEMTEST is not set # CONFIG_HYPERV_TESTING is not set # end of Kernel Testing and Coverage diff --git a/fs/proc/Makefile b/fs/proc/Makefile index 1da3ddf423c0..8704d41dd67c 100644 --- a/fs/proc/Makefile +++ b/fs/proc/Makefile @@ -34,5 +34,5 @@ proc-$(CONFIG_PROC_VMCORE) += vmcore.o proc-$(CONFIG_PRINTK) += kmsg.o proc-$(CONFIG_PROC_PAGE_MONITOR) += page.o proc-$(CONFIG_BOOT_CONFIG) += bootconfig.o -obj-$(CONFIG_MEMIG_SCAN) += memig_scan.o -obj-$(CONFIG_MEMIG_SWAP) += memig_swap.o +obj-$(CONFIG_ETMEM_SCAN) += etmem_scan.o +obj-$(CONFIG_ETMEM_SWAP) += etmem_swap.o diff --git a/fs/proc/memig_scan.c b/fs/proc/etmem_scan.c similarity index 99% rename from fs/proc/memig_scan.c rename to fs/proc/etmem_scan.c index 3964e7652127..8acf71c29958 100644 --- a/fs/proc/memig_scan.c +++ b/fs/proc/etmem_scan.c @@ -27,7 +27,7 @@ #include <asm/kvm_arm.h> #include <asm/stage2_pgtable.h> #endif -#include "memig_scan.h" +#include "etmem_scan.h"
#ifdef CONFIG_X86_64 /* diff --git a/fs/proc/memig_scan.h b/fs/proc/etmem_scan.h similarity index 100% rename from fs/proc/memig_scan.h rename to fs/proc/etmem_scan.h diff --git a/fs/proc/memig_swap.c b/fs/proc/etmem_swap.c similarity index 100% rename from fs/proc/memig_swap.c rename to fs/proc/etmem_swap.c diff --git a/lib/Kconfig b/lib/Kconfig index 041103e5519c..053ab2c4366b 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -728,16 +728,16 @@ config PARMAN config OBJAGG tristate "objagg" if COMPILE_TEST
-config MEMIG_SCAN - tristate "module: memig page scan for memig support" +config ETMEM_SCAN + tristate "module: etmem page scan for etmem support" help - memig page scan feature + etmem page scan feature used to scan the virtual address of the target process
-config MEMIG_SWAP - tristate "module: memig page swap for memig support" +config ETMEM_SWAP + tristate "module: etmem page swap for etmem support" help - memig page swap feature + etmem page swap feature
endmenu