io_uring: fix fdinfo sqe offsets calculation

[platform/kernel/linux-starfive.git] / Makefile

diff --git a/Makefile b/Makefile
index 0a170ce..f659d30 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -909,8 +909,8 @@ endif
 # Initialize all stack variables with a zero value.
 ifdef CONFIG_INIT_STACK_ALL_ZERO
 KBUILD_CFLAGS  += -ftrivial-auto-var-init=zero
-ifdef CONFIG_CC_IS_CLANG
-# https://bugs.llvm.org/show_bug.cgi?id=45497
+ifdef CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_ENABLER
+# https://github.com/llvm/llvm-project/issues/44842
 KBUILD_CFLAGS  += -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang
 endif
 endif
@@ -1001,18 +1001,7 @@ export CC_FLAGS_LTO
 endif
 
 ifdef CONFIG_CFI_CLANG
-CC_FLAGS_CFI   := -fsanitize=cfi \
-                  -fsanitize-cfi-cross-dso \
-                  -fno-sanitize-cfi-canonical-jump-tables \
-                  -fno-sanitize-trap=cfi \
-                  -fno-sanitize-blacklist
-
-ifdef CONFIG_CFI_PERMISSIVE
-CC_FLAGS_CFI   += -fsanitize-recover=cfi
-endif
-
-# If LTO flags are filtered out, we must also filter out CFI.
-CC_FLAGS_LTO   += $(CC_FLAGS_CFI)
+CC_FLAGS_CFI   := -fsanitize=kcfi
 KBUILD_CFLAGS  += $(CC_FLAGS_CFI)
 export CC_FLAGS_CFI
 endif