diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5185a2bb..a2040f57 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,10 +120,10 @@ if (ENABLE_LINUX_WORK_IRQ_FOR_IKC)
 endif()
 
 if (BUILD_TARGET STREQUAL "smp-arm64")
-	foreach(i RANGE 1 120)
-		add_definitions(-DPOSTK_DEBUG_ARCH_DEP_${i} -DPOSTK_DEBUG_TEMP_FIX_${i})
-		set(KBUILD_C_FLAGS "${KBUILD_C_FLAGS} -DPOSTK_DEBUG_ARCH_DEP_${i} -DPOSTK_DEBUG_TEMP_FIX_${i}")
-	endforeach()
+	execute_process(COMMAND bash -c "find ${CMAKE_CURRENT_SOURCE_DIR} -name \"*.[chS]\"|xargs -r grep -oE \"^#if.*def.*POSTK_DEBUG[^ ]*\" | cut -d':' -f2 | cut -d' ' -f2 | sort | uniq | awk '{print \"-D\"\$0 }' | xargs"
+		OUTPUT_VARIABLE POSTK_DEBUG_DEFINES OUTPUT_STRIP_TRAILING_WHITESPACE)
+	add_definitions("${POSTK_DEBUG_DEFINES}")
+	set(KBUILD_C_FLAGS "${KBUILD_C_FLAGS} ${POSTK_DEBUG_DEFINES}")
 
 	execute_process(COMMAND awk -F= "$1 == \"CONFIG_ARM64_64K_PAGES\" { print $2; exit; }" "${KERNEL_DIR}/.config"
 			OUTPUT_VARIABLE CONFIG_ARM64_64K_PAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
diff --git a/ihk b/ihk
index a98a13ef..907ed396 160000
--- a/ihk
+++ b/ihk
@@ -1 +1 @@
-Subproject commit a98a13ef5f1b1b174b577aadddb4c1f7246202aa
+Subproject commit 907ed3964fcfa818daf1bc769dd10a3298e28252