Index: kernel/generic/src/mm/frame.c
===================================================================
--- kernel/generic/src/mm/frame.c	(revision 1b43a0495c2749ca4430886badcc6e9320843580)
+++ kernel/generic/src/mm/frame.c	(revision f5926ad90e4b54b7902733b37f22567f77daaf2e)
@@ -231,5 +231,5 @@
  * @param pzone Pointer to preferred zone or NULL, on return contains zone number
  */
-static zone_t * find_free_zone_lock(uint8_t order, int *pzone)
+static zone_t * find_free_zone_and_lock(uint8_t order, int *pzone)
 {
 	int i;
@@ -326,5 +326,5 @@
 	if (is_left) {
 		index = (frame_index(zone, frame)) + (1 << frame->buddy_order);
-	} else { // if (is_right)
+	} else { 	/* if (is_right) */
 		index = (frame_index(zone, frame)) - (1 << frame->buddy_order);
 	}
@@ -947,5 +947,5 @@
 	 * First, find suitable frame zone.
 	 */
-	zone = find_free_zone_lock(order, pzone);
+	zone = find_free_zone_and_lock(order, pzone);
 	
 	/* If no memory, reclaim some slab memory,
@@ -954,9 +954,9 @@
 		freed = slab_reclaim(0);
 		if (freed)
-			zone = find_free_zone_lock(order, pzone);
+			zone = find_free_zone_and_lock(order, pzone);
 		if (!zone) {
 			freed = slab_reclaim(SLAB_RECLAIM_ALL);
 			if (freed)
-				zone = find_free_zone_lock(order, pzone);
+				zone = find_free_zone_and_lock(order, pzone);
 		}
 	}
@@ -1049,8 +1049,8 @@
 	
 	for (i=0; i < count; i++) {
-		zone = find_zone_and_lock(start+i,&prefzone);
+		zone = find_zone_and_lock(start + i, &prefzone);
 		if (!zone) /* PFN not found */
 			continue;
-		zone_mark_unavailable(zone, start+i-zone->base);
+		zone_mark_unavailable(zone, start + i - zone->base);
 
 		spinlock_unlock(&zone->lock);
@@ -1066,5 +1066,5 @@
 	if (config.cpu_active == 1) {
 		zones.count = 0;
-		spinlock_initialize(&zones.lock,"zones_glob_lock");
+		spinlock_initialize(&zones.lock, "zones.lock");
 	}
 	/* Tell the architecture to create some memory */