From 467bbeb74e36238bb01d848da57de362fa8b4901 Mon Sep 17 00:00:00 2001 From: rsuntk <90097027+rsuntk@users.noreply.github.com> Date: Fri, 6 Jun 2025 11:48:16 +0700 Subject: [PATCH] kernel: Remove more stray backslash in grep regex and move path_umount as optional backport --- kernel/Makefile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index 6991426b..adb47909 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -97,10 +97,10 @@ endif ifeq ($(shell grep -q "get_cred_rcu" $(srctree)/include/linux/cred.h; echo $$?),0) ccflags-y += -DKSU_COMPAT_HAS_GET_CRED_RCU else -ifeq ($(shell grep -q "atomic_long_t\s\+\usage" $(srctree)/include/linux/cred.h; echo $$?),0) +ifeq ($(shell grep -q "atomic_long_t\s\+usage" $(srctree)/include/linux/cred.h; echo $$?),0) ccflags-y += -DKSU_COMPAT_ATOMIC_LONG endif -ifeq ($(shell grep -q "int\s\+\non_rcu" $(srctree)/include/linux/cred.h; echo $$?),0) +ifeq ($(shell grep -q "int\s\+non_rcu" $(srctree)/include/linux/cred.h; echo $$?),0) ccflags-y += -DKSU_COMPAT_HAS_NONCONST_CRED endif endif @@ -118,18 +118,15 @@ ifeq ($(shell grep "ssize_t kernel_write" $(srctree)/fs/read_write.c | grep -q " ccflags-y += -DKSU_KERNEL_WRITE endif +ifeq ($(shell grep -q "int\s\+path_umount" $(srctree)/fs/namespace.c; echo $$?),0) +ccflags-y += -DKSU_HAS_PATH_UMOUNTAdd commentMore actions +endif + # 检查三星 UH 驱动程序 ifeq ($(shell grep -q "CONFIG_KDP_CRED" $(srctree)/kernel/cred.c; echo $$?),0) ccflags-y += -DSAMSUNG_UH_DRIVER_EXIST endif -#ccflags-y += -DKSU_UMOUNT - -# Do checks before compile -ifeq ($(shell grep -q "int\s\+path_umount" $(srctree)/fs/namespace.c; echo $$?),0) -ccflags-y += -DKSU_HAS_PATH_UMOUNT -endif - ## For susfs stuff ## ifeq ($(shell test -e $(srctree)/fs/susfs.c; echo $$?),0) $(eval SUSFS_VERSION=$(shell cat $(srctree)/include/linux/susfs.h | grep -E '^#define SUSFS_VERSION' | cut -d' ' -f3 | sed 's/"//g'))