diff --git a/kernel.mk b/kernel.mk index ca99f3b..d145e7f 100644 --- a/kernel.mk +++ b/kernel.mk @@ -98,6 +98,7 @@ OHOE_HEADERS_FILE := ${OHOS_BUILD_HOME}/kernel/linux/common_modules/ohoe_headers WATCHDOG_PATCH_FILE := ${DEVICE_PATCH_DIR}/watchdog.patch OH_HEADERS_PATCH_FILE := ${DEVICE_PATCH_DIR}/oh_headers.patch MD_STOP_WRITES_PATCH_FILE := ${DEVICE_PATCH_DIR}/md_stop_writes.patch +KVM_FIX_PATCH_FILE := ${DEVICE_PATCH_DIR}/kvm_fix.patch endif export KBUILD_OUTPUT=$(KERNEL_OBJ_TMP_PATH) @@ -153,6 +154,10 @@ endif ifeq ($(MD_STOP_WRITES_PATCH_FILE), $(wildcard $(MD_STOP_WRITES_PATCH_FILE))) $(hide) cd $(KERNEL_SRC_TMP_PATH) && patch -p1 < $(MD_STOP_WRITES_PATCH_FILE) endif +# Apply KVM fix patch (fixes kvm_iodevice_destructor visibility issue) +ifeq ($(KVM_FIX_PATCH_FILE), $(wildcard $(KVM_FIX_PATCH_FILE))) + $(hide) cd $(KERNEL_SRC_TMP_PATH) && patch -p1 < $(KVM_FIX_PATCH_FILE) +endif endif $(hide) cp -rf $(KERNEL_CONFIG_PATH)/. $(KERNEL_SRC_TMP_PATH)/ $(hide) $(KERNEL_MAKE) -C $(KERNEL_SRC_TMP_PATH) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) distclean