[SRU][K][PATCH 10/16] UBUNTU: [Config] Enable CONFIG_CACHEFILES_ERROR_INJECTION on riscv64

Emil Renner Berthing emil.renner.berthing at canonical.com
Tue Jul 12 12:04:41 UTC 2022


BugLink: https://bugs.launchpad.net/bugs/1981437

This option was not annotated in the linux-riscv tree, so let's align it
with the other architectures.

Signed-off-by: Emil Renner Berthing <emil.renner.berthing at canonical.com>
---
 debian.master/config/amd64/config.common.amd64     | 1 -
 debian.master/config/arm64/config.common.arm64     | 1 -
 debian.master/config/armhf/config.common.armhf     | 1 -
 debian.master/config/config.common.ubuntu          | 1 +
 debian.master/config/ppc64el/config.common.ppc64el | 1 -
 debian.master/config/riscv64/config.common.riscv64 | 1 -
 debian.master/config/s390x/config.common.s390x     | 1 -
 7 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index df5cba5ec03b..f8101b7e02e0 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -55,7 +55,6 @@ CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_BLK_DEV_SX8=m
 CONFIG_BSD_DISKLABEL=y
 CONFIG_C2PORT=m
-CONFIG_CACHEFILES_ERROR_INJECTION=y
 CONFIG_CADENCE_WATCHDOG=m
 CONFIG_CAIF=m
 CONFIG_CAN=m
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 20c1940d427f..a5e25181fd2f 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -57,7 +57,6 @@ CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_BLK_DEV_SX8=m
 CONFIG_BSD_DISKLABEL=y
 CONFIG_C2PORT=m
-CONFIG_CACHEFILES_ERROR_INJECTION=y
 CONFIG_CADENCE_WATCHDOG=m
 CONFIG_CAIF=m
 CONFIG_CAN=m
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 561296ec8ce9..85a695b750f7 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -52,7 +52,6 @@ CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_BLK_DEV_SX8=m
 CONFIG_BSD_DISKLABEL=y
 CONFIG_C2PORT=m
-CONFIG_CACHEFILES_ERROR_INJECTION=y
 CONFIG_CADENCE_WATCHDOG=m
 CONFIG_CAIF=m
 CONFIG_CAN=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 37ab5fd465fb..dcaf1a1cedc1 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1469,6 +1469,7 @@ CONFIG_BYTCRC_PMIC_OPREGION=y
 CONFIG_C2PORT_DURAMAR_2150=m
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
+CONFIG_CACHEFILES_ERROR_INJECTION=y
 # CONFIG_CACHEFILES_ONDEMAND is not set
 CONFIG_CACHE_FEROCEON_L2=y
 # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index e29ed7a88329..815177cf84bf 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -51,7 +51,6 @@ CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_BLK_DEV_SX8=m
 CONFIG_BSD_DISKLABEL=y
 CONFIG_C2PORT=m
-CONFIG_CACHEFILES_ERROR_INJECTION=y
 CONFIG_CADENCE_WATCHDOG=m
 CONFIG_CAIF=m
 CONFIG_CAN=m
diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64
index fb3c9688c3d2..77aecd8bf41d 100644
--- a/debian.master/config/riscv64/config.common.riscv64
+++ b/debian.master/config/riscv64/config.common.riscv64
@@ -50,7 +50,6 @@ CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_BLK_DEV_SX8=m
 CONFIG_BSD_DISKLABEL=y
 CONFIG_C2PORT=m
-# CONFIG_CACHEFILES_ERROR_INJECTION is not set
 CONFIG_CADENCE_WATCHDOG=m
 CONFIG_CAIF=m
 CONFIG_CAN=m
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 10e6de6fcfe7..565c6394bd5f 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -41,7 +41,6 @@ CONFIG_AUTOFS_FS=y
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BSD_DISKLABEL is not set
 # CONFIG_C2PORT is not set
-CONFIG_CACHEFILES_ERROR_INJECTION=y
 # CONFIG_CADENCE_WATCHDOG is not set
 # CONFIG_CAIF is not set
 # CONFIG_CAN is not set
-- 
2.36.1




More information about the kernel-team mailing list