From 77ab80e7ad446afb6272f12334cd1d29207209e5 Mon Sep 17 00:00:00 2001 From: gaochao Date: Sun, 31 Jul 2022 22:26:52 +0800 Subject: [PATCH] ohos inclusion category: feature issue:I5JRX5 CVE: NA Signed-off-by: gaochao -------- change config and function name of trace ponit --- linux-5.10/hispark_taurus_patch/hispark_taurus.patch | 2 +- linux-5.10/rk3568_patch/kernel.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux-5.10/hispark_taurus_patch/hispark_taurus.patch b/linux-5.10/hispark_taurus_patch/hispark_taurus.patch index 04fdc7b..dff2f1f 100755 --- a/linux-5.10/hispark_taurus_patch/hispark_taurus.patch +++ b/linux-5.10/hispark_taurus_patch/hispark_taurus.patch @@ -12363,7 +12363,7 @@ index f13d70df6557..22c0f9f57eda 100644 @@ -194,3 +194,7 @@ obj-$(CONFIG_COUNTER) += counter/ obj-$(CONFIG_MOST) += most/ obj-$(CONFIG_ACCESS_TOKENID) += accesstokenid/ - obj-$(CONFIG_VENDOR_HOOKS) += hooks/ + obj-$(CONFIG_VENDOR_TRACES) += vendor/ +obj-$(CONFIG_HI_DMAC) += hidmac/ +obj-$(CONFIG_HIEDMAC) += hiedmac/ +obj-$(CONFIG_ARCH_HISI_BVT) += hisilicon/ diff --git a/linux-5.10/rk3568_patch/kernel.patch b/linux-5.10/rk3568_patch/kernel.patch index dcbf626..f092be1 100644 --- a/linux-5.10/rk3568_patch/kernel.patch +++ b/linux-5.10/rk3568_patch/kernel.patch @@ -103616,10 +103616,10 @@ diff --git a/drivers/Makefile b/drivers/Makefile index 8ec75883a..5ffe117f9 100644 --- a/drivers/Makefile +++ b/drivers/Makefile -@@ -195,3 +195,5 @@ obj-$(CONFIG_DRIVERS_HDF) += hdf/ +@@ -194,3 +194,5 @@ obj-$(CONFIG_COUNTER) += counter/ obj-$(CONFIG_MOST) += most/ obj-$(CONFIG_ACCESS_TOKENID) += accesstokenid/ - obj-$(CONFIG_VENDOR_HOOKS) += hooks/ + obj-$(CONFIG_VENDOR_TRACES) += vendor/ +obj-$(CONFIG_RK_FLASH) += rkflash/ +obj-$(CONFIG_RK_NAND) += rk_nand/ diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c -- Gitee