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, so set default value for them in arch/arm64/configs/hulk_defconfig. Enable CONFIG_EDAC_I10NM, CONFIG_INTEL_SPEED_SELECT_INTERFACE and CONFIG_DEV_DAX_KMEM as module by default in arch/x86/configs/hulk_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/hulk_defconfig | 2 ++ arch/x86/configs/hulk_defconfig | 3 +++ 2 files changed, 5 insertions(+) diff --git a/arch/arm64/configs/hulk_defconfig b/arch/arm64/configs/hulk_defconfig index c340b5408e9d3..45ca392bd0585 100644 --- a/arch/arm64/configs/hulk_defconfig +++ b/arch/arm64/configs/hulk_defconfig @@ -669,6 +669,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 @@ -4814,6 +4815,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/hulk_defconfig b/arch/x86/configs/hulk_defconfig index cb1a35c92fb52..0dcb3c9a8dbc3 100644 --- a/arch/x86/configs/hulk_defconfig +++ b/arch/x86/configs/hulk_defconfig @@ -5771,6 +5771,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 @@ -6051,6 +6052,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 @@ -6565,6 +6567,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 # -- 2.25.1