diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 081a223bc65b1b1157e03c5c07bf1418d1a0b05a..2d909358ecb2c40caa897d50444ad36d11a401a2 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -1076,6 +1076,7 @@ CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y # CONFIG_LRU_GEN is not set CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y CONFIG_PER_VMA_LOCK=y +CONFIG_GMEM=y # # Data Access Monitoring @@ -3482,6 +3483,7 @@ CONFIG_TCG_TIS_ST33ZP24_I2C=m CONFIG_TCG_TIS_ST33ZP24_SPI=m # CONFIG_XILLYBUS is not set # CONFIG_XILLYUSB is not set +CONFIG_GMEM_DEV=m # end of Character devices # diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index f6140635690e2876c2aa499da11d6ca2164a492d..24c7560f74c42c7bdb9038ebe55c1894f51e8300 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -1102,6 +1102,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y # CONFIG_LRU_GEN is not set CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y CONFIG_PER_VMA_LOCK=y +CONFIG_GMEM=y # # Data Access Monitoring @@ -3731,6 +3732,7 @@ CONFIG_TCG_TIS_ST33ZP24_SPI=m CONFIG_TELCLOCK=m # CONFIG_XILLYBUS is not set # CONFIG_XILLYUSB is not set +CONFIG_GMEM_DEV=m # end of Character devices # diff --git a/drivers/char/gmem_dev.c b/drivers/char/gmem_dev.c index 225ed506a9c095ac3daeaa5ce92e8ee304a61d13..fcb9935cd867af852c90a2eae1b27de2a1e8c298 100644 --- a/drivers/char/gmem_dev.c +++ b/drivers/char/gmem_dev.c @@ -114,3 +114,4 @@ static struct miscdevice gmem_miscdev = { }; builtin_misc_device(gmem_miscdev); +MODULE_LICENSE("GPL"); diff --git a/mm/Kconfig b/mm/Kconfig index b950407dd87fd9d814b891bad3138967c4c33cb7..7bf98487c1ccf03811f23020072bf4e0be1a42be 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -1210,7 +1210,6 @@ config GMEM bool "gmem subsystem for multi-MMU cooperative management" depends on (ARM64 || X86_64) && MMU && TRANSPARENT_HUGEPAGE select ARCH_USES_HIGH_VMA_FLAGS - select GMEM_DEV default y help say Y here to enable gmem subsystem