Index: generic/include/debug.h
===================================================================
--- generic/include/debug.h	(revision c7c0b89b6e6a42abfe99e8cb5d3d5882ffdeac6e)
+++ generic/include/debug.h	(revision 12c7f27b4fc44ac2d4bb7ef6ea741ea7a8ad1dff)
@@ -50,5 +50,5 @@
  */
 #ifdef CONFIG_DEBUG
-#	define ASSERT(expr) if (!(expr)) { panic("assertion failed (%s), caller=%P\n", #expr, CALLER); }
+#	define ASSERT(expr) if (!(expr)) { panic("assertion failed (%s), caller=%p\n", #expr, CALLER); }
 #else
 #	define ASSERT(expr)
Index: generic/src/adt/btree.c
===================================================================
--- generic/src/adt/btree.c	(revision c7c0b89b6e6a42abfe99e8cb5d3d5882ffdeac6e)
+++ generic/src/adt/btree.c	(revision 12c7f27b4fc44ac2d4bb7ef6ea741ea7a8ad1dff)
@@ -118,5 +118,5 @@
 	if (!lnode) {
 		if (btree_search(t, key, &lnode)) {
-			panic("B-tree %P already contains key %d\n", t, key);
+			panic("B-tree %p already contains key %d\n", t, key);
 		}
 	}
@@ -201,5 +201,5 @@
 	if (!lnode) {
 		if (!btree_search(t, key, &lnode)) {
-			panic("B-tree %P does not contain key %d\n", t, key);
+			panic("B-tree %p does not contain key %d\n", t, key);
 		}
 	}
@@ -501,5 +501,5 @@
 		}
 	}
-	panic("node %P does not contain key %d\n", node, key);
+	panic("node %p does not contain key %d\n", node, key);
 }
 
@@ -528,5 +528,5 @@
 		}
 	}
-	panic("node %P does not contain key %d\n", node, key);
+	panic("node %p does not contain key %d\n", node, key);
 }
 
@@ -670,5 +670,5 @@
 			return i - (int) (right != false);
 	}
-	panic("node %P does not contain subtree %P\n", node, subtree);
+	panic("node %p does not contain subtree %p\n", node, subtree);
 }
 
Index: generic/src/main/main.c
===================================================================
--- generic/src/main/main.c	(revision c7c0b89b6e6a42abfe99e8cb5d3d5882ffdeac6e)
+++ generic/src/main/main.c	(revision 12c7f27b4fc44ac2d4bb7ef6ea741ea7a8ad1dff)
@@ -177,6 +177,5 @@
 
 	version_print();
-	printf("%#zX: hardcoded_ktext_size=%zdK, hardcoded_kdata_size=%zdK\n",
-		config.base, hardcoded_ktext_size/1024, hardcoded_kdata_size/1024);
+	printf("%#zx: hardcoded_ktext_size=%zdK, hardcoded_kdata_size=%zdK\n", config.base, hardcoded_ktext_size / 1024, hardcoded_kdata_size / 1024);
 
 	arch_pre_smp_init();
@@ -197,5 +196,5 @@
 	
 	for (i = 0; i < init.cnt; i++)
-		printf("init[%zd].addr=%P, init[%zd].size=%zd\n", i, init.tasks[i].addr, i, init.tasks[i].size);
+		printf("init[%zd].addr=%p, init[%zd].size=%zd\n", i, init.tasks[i].addr, i, init.tasks[i].size);
 	
 	ipc_init();
Index: generic/src/mm/frame.c
===================================================================
--- generic/src/mm/frame.c	(revision c7c0b89b6e6a42abfe99e8cb5d3d5882ffdeac6e)
+++ generic/src/mm/frame.c	(revision 12c7f27b4fc44ac2d4bb7ef6ea741ea7a8ad1dff)
@@ -1029,6 +1029,5 @@
 		zone = zones.info[i];
 		spinlock_lock(&zone->lock);
-		printf("%d: %#X \t%zd\t\t%zd\n",i,PFN2ADDR(zone->base), 
-		       zone->free_count, zone->busy_count);
+		printf("%d: %#x \t%zd\t\t%zd\n", i, PFN2ADDR(zone->base), zone->free_count, zone->busy_count);
 		spinlock_unlock(&zone->lock);
 	}
Index: generic/src/mm/page.c
===================================================================
--- generic/src/mm/page.c	(revision c7c0b89b6e6a42abfe99e8cb5d3d5882ffdeac6e)
+++ generic/src/mm/page.c	(revision 12c7f27b4fc44ac2d4bb7ef6ea741ea7a8ad1dff)
@@ -64,9 +64,9 @@
 	int i, cnt, length;
 
-	length = size + (s - (s & ~(PAGE_SIZE-1)));
-	cnt = length/PAGE_SIZE + (length%PAGE_SIZE>0);
+	length = size + (s - (s & ~(PAGE_SIZE - 1)));
+	cnt = length / PAGE_SIZE + (length % PAGE_SIZE > 0);
 
 	for (i = 0; i < cnt; i++)
-		page_mapping_insert(AS_KERNEL, s + i*PAGE_SIZE, s + i*PAGE_SIZE, PAGE_NOT_CACHEABLE);
+		page_mapping_insert(AS_KERNEL, s + i * PAGE_SIZE, s + i * PAGE_SIZE, PAGE_NOT_CACHEABLE);
 
 }
Index: generic/src/proc/scheduler.c
===================================================================
--- generic/src/proc/scheduler.c	(revision c7c0b89b6e6a42abfe99e8cb5d3d5882ffdeac6e)
+++ generic/src/proc/scheduler.c	(revision 12c7f27b4fc44ac2d4bb7ef6ea741ea7a8ad1dff)
@@ -634,5 +634,5 @@
 
 		spinlock_lock(&cpus[cpu].lock);
-		printf("cpu%d: address=%P, nrdy=%ld, needs_relink=%ld\n",
+		printf("cpu%d: address=%p, nrdy=%ld, needs_relink=%ld\n",
 		       cpus[cpu].id, &cpus[cpu], atomic_get(&cpus[cpu].nrdy), cpus[cpu].needs_relink);