summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlele.liu <lele.liu@amlogic.com>2021-11-04 01:46:43 +0000
committerLiang Ji <liang.ji@amlogic.com>2021-11-04 11:00:14 +0800
commit86ef5c7866e3e4d76fee26f9080cc995e710893d (patch)
tree607f7998d29c15bdd3bfda5887a09e802c6a135b
parent85fff4bac91a79b90a7cca846cf1a697160ae5f8 (diff)
downloadarm64-android-tv-deadpool-4.9-android12.tar.gz
vts: vts_kernel_checkpoint_test [1/2]android-tv-12.0.0_r0.2android-tv-deadpool-4.9-android12
PD#SWPL-63211 Problem: short of dm_bow config Solution: enable dm_bow config Verify: local Change-Id: I503d20b44651b91ab13449d51814c2b1b668d9d7 Signed-off-by: lele.liu <lele.liu@amlogic.com>
-rw-r--r--arch/arm64/configs/meson64_defconfig4
-rw-r--r--drivers/md/dm-bow.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm64/configs/meson64_defconfig b/arch/arm64/configs/meson64_defconfig
index 7876a4840805..aff57c3e7a78 100644
--- a/arch/arm64/configs/meson64_defconfig
+++ b/arch/arm64/configs/meson64_defconfig
@@ -22,6 +22,7 @@ CONFIG_MEMCG=y
CONFIG_MEMCG_SWAP=y
CONFIG_CGROUP_SCHED=y
CONFIG_CGROUP_BPF=y
+CONFIG_CHECKPOINT_RESTORE=y
CONFIG_NAMESPACES=y
CONFIG_SCHED_TUNE=y
CONFIG_DEFAULT_USE_ENERGY_AWARE=y
@@ -397,6 +398,7 @@ CONFIG_DM_SNAPSHOT=y
CONFIG_DM_VERITY=y
CONFIG_DM_VERITY_FEC=y
CONFIG_DM_VERITY_AVB=y
+CONFIG_DM_BOW=y
CONFIG_NETDEVICES=y
CONFIG_TUN=y
# CONFIG_NET_VENDOR_3COM is not set
@@ -592,13 +594,13 @@ CONFIG_USB_DWC3_HOST=y
CONFIG_USB_SERIAL=y
CONFIG_USB_GADGET=y
CONFIG_USB_CONFIGFS=y
+CONFIG_USB_CONFIGFS_NCM=y
CONFIG_USB_CONFIGFS_RNDIS=y
CONFIG_USB_CONFIGFS_F_FS=y
CONFIG_USB_CONFIGFS_F_MTP=y
CONFIG_USB_CONFIGFS_F_PTP=y
CONFIG_USB_CONFIGFS_F_ACC=y
CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y
-CONFIG_USB_CONFIGFS_NCM=y
CONFIG_USB_CONFIGFS_UEVENT=y
CONFIG_USB_CONFIGFS_F_MIDI=y
CONFIG_MMC=y
diff --git a/drivers/md/dm-bow.c b/drivers/md/dm-bow.c
index b45f0b2fcc7c..3ebe568a5200 100644
--- a/drivers/md/dm-bow.c
+++ b/drivers/md/dm-bow.c
@@ -12,7 +12,9 @@
#include <linux/module.h>
#define DM_MSG_PREFIX "bow"
+#ifndef CONFIG_AMLOGIC_MODIFY
#define SECTOR_SIZE 512
+#endif
struct log_entry {
u64 source;