mirror of
https://github.com/openharmony/kernel_linux_build.git
synced 2026-07-18 15:54:30 -04:00
fix: add md_stop_writes patch reference to kernel.mk
The __md_stop_writes() function in drivers/md/md.c was partially updated with newer kernel API calls (mddev_is_dm, md_bitmap_enabled 2-arg version, bitmap_ops member) that don't exist in linux-6.6, causing 6 compilation errors. This adds the MD_STOP_WRITES_PATCH_FILE reference to kernel.mk so the fix patch is applied during kernel build. Change-Id: I5309af8051b0492d07a72516e7d7a582c9d7f727 Co-Authored-By: Agent Signed-off-by: handyohos <zhangxiaotian@huawei.com> Change-Id: I00c702c71a491d673f8e2633222e35689e9c78d8
This commit is contained in:
@@ -97,6 +97,7 @@ HIDEADDR_PATCH_FILE := ${OHOS_BUILD_HOME}/kernel/linux/common_modules/memory_sec
|
||||
OHOE_HEADERS_FILE := ${OHOS_BUILD_HOME}/kernel/linux/common_modules/ohoe_headers/apply_ohoe_headers.sh
|
||||
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
|
||||
endif
|
||||
|
||||
export KBUILD_OUTPUT=$(KERNEL_OBJ_TMP_PATH)
|
||||
@@ -148,6 +149,10 @@ endif
|
||||
ifeq ($(WATCHDOG_PATCH_FILE), $(wildcard $(WATCHDOG_PATCH_FILE)))
|
||||
$(hide) cd $(KERNEL_SRC_TMP_PATH) && patch -p1 < $(WATCHDOG_PATCH_FILE)
|
||||
endif
|
||||
# Apply MD stop writes fix patch (required for linux-6.6)
|
||||
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
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user