diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare
index ecb3b24..96b5b99 100644
--- a/linux-tkg-config/prepare
+++ b/linux-tkg-config/prepare
@@ -981,7 +981,8 @@ _tkg_srcprep() {
   fi
 
   if [ "$_compiler_name" = "-llvm" ]; then
-    _disable "KCSAN"
+    _disable "KCSAN" "KMSAN" "CFI_PERMISSIVE" "CFI_CLANG"
+
     if [ "$_kver" != "504" ] && [ "$_kver" != "507" ] && [ "$_kver" != "508" ]; then
       _disable "INIT_STACK_ALL_PATTERN"
     else