diff --git a/sys/kern/kern_selfpatch.c b/sys/kern/kern_selfpatch.c
index 7f03744584bb19..60477e8b68401b 100644
--- a/sys/kern/kern_selfpatch.c
+++ b/sys/kern/kern_selfpatch.c
@@ -134,6 +134,8 @@ lf_selfpatch(linker_file_t lf, int mod)
 	count = stop - start;
 	DBG("count: %d\n", count);
 
+	critical_enter();
+
 	for (patch = start; patch != stop; patch++) {
 		DBG("apply: %p\n", patch);
 		ret = lf_selfpatch_apply(lf, patch, mod);
@@ -141,6 +143,8 @@ lf_selfpatch(linker_file_t lf, int mod)
 			return (ret);
 	}
 
+	critical_exit();
+
 #ifdef KSP_DEBUG
 	/*
 	 * when selfpatch does not works, the system should crash