From 12a70ecab064e315e567a779ce5400ce7a86673e Mon Sep 17 00:00:00 2001 From: liubo Date: Wed, 10 Mar 2021 17:17:48 +0800 Subject: [PATCH] etmem: Modify the memig feature name to etmem euleros inclusion category: feature feature: etmem bugzilla: 48246 ------------------------------------------------- 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 Reviewed-by: geruijun Reviewed-by: Xiongfeng Wang Signed-off-by: Zheng Zengkai --- 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 9ab0ba65f954..9d3dd3d0aec0 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -7110,5 +7110,5 @@ CONFIG_CC_HAS_SANCOV_TRACE_PC=y CONFIG_MPAM=y CONFIG_RESCTRL=y CONFIG_ACPI_MPAM=y -CONFIG_MEMIG_SCAN=m -CONFIG_MEMIG_SWAP=m +CONFIG_ETMEM_SCAN=m +CONFIG_ETMEM_SWAP=m diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index 0fd82af04739..44b7c7340d59 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -8496,5 +8496,5 @@ CONFIG_ARCH_HAS_KCOV=y # CONFIG_HYPERV_TESTING is not set # end of Kernel Testing and Coverage # end of Kernel hacking -CONFIG_MEMIG_SCAN=m -CONFIG_MEMIG_SWAP=m +CONFIG_ETMEM_SCAN=m +CONFIG_ETMEM_SWAP=m 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 44c8ccaabed1..590e6b5d363f 100644 --- a/fs/proc/memig_scan.c +++ b/fs/proc/etmem_scan.c @@ -27,7 +27,7 @@ #include #include #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 bf2f8e546f4f..cb5e620bf100 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -660,16 +660,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 config STRING_SELFTEST tristate "Test string functions" -- GitLab