Index: kernel/generic/src/adt/avl.c
===================================================================
--- kernel/generic/src/adt/avl.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ kernel/generic/src/adt/avl.c	(revision a35a3d819d4e2e4e35964eea617087b5c6431b02)
@@ -412,6 +412,7 @@
 		 * node.
 		 */
-		for (cur = node->lft; cur->rgt != NULL; cur = cur->rgt)
-			;
+		cur = node->lft;
+		while (cur->rgt != NULL)
+			cur = cur->rgt;
 
 		if (cur != node->lft) {
@@ -462,5 +463,5 @@
 	 * cut-off node up to the root.
 	 */
-	for (;;) {
+	while (true) {
 		if (dir == LEFT) {
 			/*
Index: kernel/generic/src/console/kconsole.c
===================================================================
--- kernel/generic/src/console/kconsole.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ kernel/generic/src/console/kconsole.c	(revision a35a3d819d4e2e4e35964eea617087b5c6431b02)
@@ -264,8 +264,9 @@
 			}
 
-			for (max_match_len_tmp = 0;
-			    (output[max_match_len_tmp] ==
+			max_match_len_tmp = 0;
+			while ((output[max_match_len_tmp] ==
 			    hint[max_match_len_tmp]) &&
-			    (max_match_len_tmp < max_match_len); ++max_match_len_tmp);
+			    (max_match_len_tmp < max_match_len))
+				++max_match_len_tmp;
 
 			max_match_len = max_match_len_tmp;
@@ -373,7 +374,7 @@
 				beg = 0;
 			} else {
-				for (beg = position - 1;
-				    (beg > 0) && (!isspace(current[beg]));
-				    beg--);
+				beg = position - 1;
+				while ((beg > 0) && (!isspace(current[beg])))
+				    beg--;
 
 				if (isspace(current[beg]))