Enable iSCSI target and RAM block devices flags in kernel BUG=b/325147066 TEST=presubmit RELEASE_NOTE=Added support for iSCSI targets and RAM block devices. cos-patch: bug Signed-off-by: Kevin Berry <kpberry@google.com> Reviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/65673 Reviewed-by: Oleksandr Tymoshenko <ovt@google.com> Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com> Change-Id: Iffc3edd7916ea6f4b0da428fa9102e8032011913 Reviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/66950 Main-Branch-Verified: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
diff --git a/arch/arm64/configs/lakitu_defconfig b/arch/arm64/configs/lakitu_defconfig index c353099..f957630 100644 --- a/arch/arm64/configs/lakitu_defconfig +++ b/arch/arm64/configs/lakitu_defconfig
@@ -1878,7 +1878,9 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 # CONFIG_BLK_DEV_DRBD is not set # CONFIG_BLK_DEV_NBD is not set -# CONFIG_BLK_DEV_RAM is not set +CONFIG_BLK_DEV_RAM=m +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set CONFIG_XEN_BLKDEV_FRONTEND=y @@ -2189,7 +2191,7 @@ # CONFIG_TCM_PSCSI is not set CONFIG_TCM_USER2=m CONFIG_LOOPBACK_TARGET=m -# CONFIG_ISCSI_TARGET is not set +CONFIG_ISCSI_TARGET=m # CONFIG_FUSION is not set #
diff --git a/arch/x86/configs/lakitu_defconfig b/arch/x86/configs/lakitu_defconfig index 826869f..c7546d4 100644 --- a/arch/x86/configs/lakitu_defconfig +++ b/arch/x86/configs/lakitu_defconfig
@@ -1902,7 +1902,9 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 # CONFIG_BLK_DEV_DRBD is not set # CONFIG_BLK_DEV_NBD is not set -# CONFIG_BLK_DEV_RAM is not set +CONFIG_BLK_DEV_RAM=m +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set CONFIG_XEN_BLKDEV_FRONTEND=y @@ -2215,7 +2217,7 @@ # CONFIG_TCM_PSCSI is not set CONFIG_TCM_USER2=m CONFIG_LOOPBACK_TARGET=m -# CONFIG_ISCSI_TARGET is not set +CONFIG_ISCSI_TARGET=m # CONFIG_FUSION is not set # @@ -3898,7 +3900,7 @@ # CONFIG_CRYPTO_SHA512_SSSE3 is not set # CONFIG_CRYPTO_SM3_AVX_X86_64 is not set # CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set -# CONFIG_CRYPTO_CRC32C_INTEL is not set +CONFIG_CRYPTO_CRC32C_INTEL=m # CONFIG_CRYPTO_CRC32_PCLMUL is not set # CONFIG_CRYPTO_CRCT10DIF_PCLMUL is not set # end of Accelerated Cryptographic Algorithms for CPU (x86)