From: Zheng Zengkai zhengzengkai@huawei.com
hulk inclusion category: Feature bugzilla: https://gitee.com/openeuler/kernel/issues/I47H3V CVE: NA
-------------------------------------------------
CONFIG_ACPI_HMAT and CONFIG_DEV_DAX_KMEM are newly introduced, set default value for them in arch/arm64/configs/openeuler_defconfig.
Enable CONFIG_EDAC_I10NM, CONFIG_INTEL_SPEED_SELECT_INTERFACE and CONFIG_DEV_DAX_KMEM as module by default in arch/x86/configs/openeuler_defconfig.
Signed-off-by: Zheng Zengkai zhengzengkai@huawei.com Reviewed-by: Xie XiuQi xiexiuqi@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- arch/arm64/configs/openeuler_defconfig | 2 ++ arch/x86/configs/openeuler_defconfig | 3 +++ 2 files changed, 5 insertions(+)
diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 02ab2b4960abd..84f15cef5bdab 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -661,6 +661,7 @@ CONFIG_ACPI_HED=y # CONFIG_ACPI_BGRT is not set CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y CONFIG_ACPI_NFIT=m +# CONFIG_ACPI_HMAT is not set CONFIG_HAVE_ACPI_APEI=y CONFIG_ACPI_APEI=y CONFIG_ACPI_APEI_GHES=y @@ -5144,6 +5145,7 @@ CONFIG_OF_PMEM=m CONFIG_DAX_DRIVER=y CONFIG_DAX=y CONFIG_DEV_DAX=m +# CONFIG_DEV_DAX_KMEM is not set CONFIG_NVMEM=y # CONFIG_QCOM_QFPROM is not set
diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index 25a29ad1f9cb3..ba9c4aedf1fe7 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -5772,6 +5772,7 @@ CONFIG_EDAC_I5100=m CONFIG_EDAC_I7300=m CONFIG_EDAC_SBRIDGE=m CONFIG_EDAC_SKX=m +CONFIG_EDAC_I10NM=m CONFIG_EDAC_PND2=m CONFIG_RTC_LIB=y CONFIG_RTC_MC146818_LIB=y @@ -6052,6 +6053,7 @@ CONFIG_MLX_PLATFORM=m CONFIG_INTEL_TURBO_MAX_3=y # CONFIG_I2C_MULTI_INSTANTIATE is not set # CONFIG_INTEL_ATOMISP2_PM is not set +CONFIG_INTEL_SPEED_SELECT_INTERFACE=m CONFIG_PMC_ATOM=y # CONFIG_CHROME_PLATFORMS is not set CONFIG_MELLANOX_PLATFORM=y @@ -6566,6 +6568,7 @@ CONFIG_DAX_DRIVER=y CONFIG_DAX=y CONFIG_DEV_DAX=m CONFIG_DEV_DAX_PMEM=m +CONFIG_DEV_DAX_KMEM=m CONFIG_NVMEM=y
#