From 3fe246f9c445aa7a21a4d258d2a7e2b7c745a0f4 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Fri, 11 Dec 2020 16:11:11 +0200 Subject: [PATCH] Update riscv configs [..] Error: Mismatches found in configuration files Found CONFIG_VIRT_CPU_ACCOUNTING_GEN=y after generation, had CONFIG_VIRT_CPU_ACCOUNTING_GEN=is not set in Source tree Found # CONFIG_STRICT_DEVMEM is not set, after generation, had CONFIG_STRICT_DEVMEM y in Source tree [..] It looks like Plamer's patchset was never merged to enable STRICT_DEVMEM. https://lkml.org/lkml/2020/7/9/1087 Signed-off-by: David Abdurachmanov --- configs/fedora/generic/riscv/CONFIG_STRICT_DEVMEM | 1 + configs/fedora/generic/riscv/CONFIG_VIRT_CPU_ACCOUNTING_GEN | 1 - kernel-riscv64-debug-fedora.config | 4 ++-- kernel-riscv64-fedora.config | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 configs/fedora/generic/riscv/CONFIG_STRICT_DEVMEM delete mode 100644 configs/fedora/generic/riscv/CONFIG_VIRT_CPU_ACCOUNTING_GEN diff --git a/configs/fedora/generic/riscv/CONFIG_STRICT_DEVMEM b/configs/fedora/generic/riscv/CONFIG_STRICT_DEVMEM new file mode 100644 index 000000000..4d6074322 --- /dev/null +++ b/configs/fedora/generic/riscv/CONFIG_STRICT_DEVMEM @@ -0,0 +1 @@ +# CONFIG_STRICT_DEVMEM is not set diff --git a/configs/fedora/generic/riscv/CONFIG_VIRT_CPU_ACCOUNTING_GEN b/configs/fedora/generic/riscv/CONFIG_VIRT_CPU_ACCOUNTING_GEN deleted file mode 100644 index 5d16b4cb7..000000000 --- a/configs/fedora/generic/riscv/CONFIG_VIRT_CPU_ACCOUNTING_GEN +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config index 659def7f4..2b934c829 100644 --- a/kernel-riscv64-debug-fedora.config +++ b/kernel-riscv64-debug-fedora.config @@ -5565,7 +5565,7 @@ CONFIG_STMMAC_ETH=m # CONFIG_STMMAC_PCI is not set # CONFIG_STMMAC_PLATFORM is not set # CONFIG_STMMAC_SELFTESTS is not set -CONFIG_STRICT_DEVMEM=y +# CONFIG_STRICT_DEVMEM is not set CONFIG_STRICT_KERNEL_RWX=y # CONFIG_STRING_SELFTEST is not set CONFIG_STRIP_ASM_SYMS=y @@ -6460,7 +6460,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_VIDEO_VS6624=m # CONFIG_VIDEO_XILINX is not set # CONFIG_VIPERBOARD_ADC is not set -# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set +CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set # CONFIG_VIRT_DRIVERS is not set CONFIG_VIRTIO_BALLOON=m diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config index a548ae9a6..6ef072f3f 100644 --- a/kernel-riscv64-fedora.config +++ b/kernel-riscv64-fedora.config @@ -5543,7 +5543,7 @@ CONFIG_STMMAC_ETH=m # CONFIG_STMMAC_PCI is not set # CONFIG_STMMAC_PLATFORM is not set # CONFIG_STMMAC_SELFTESTS is not set -CONFIG_STRICT_DEVMEM=y +# CONFIG_STRICT_DEVMEM is not set CONFIG_STRICT_KERNEL_RWX=y # CONFIG_STRING_SELFTEST is not set CONFIG_STRIP_ASM_SYMS=y @@ -6438,7 +6438,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_VIDEO_VS6624=m # CONFIG_VIDEO_XILINX is not set # CONFIG_VIPERBOARD_ADC is not set -# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set +CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set # CONFIG_VIRT_DRIVERS is not set CONFIG_VIRTIO_BALLOON=m