Index: kernel/arch/ppc32/src/mm/page.c
===================================================================
--- kernel/arch/ppc32/src/mm/page.c	(revision f4c2b6a104d4ab9ce057413b12ff1efedcba0fcd)
+++ kernel/arch/ppc32/src/mm/page.c	(revision 7560b606cea3b9fdec24aa6444d3e37011f2d025)
@@ -48,11 +48,14 @@
 uintptr_t hw_map(uintptr_t physaddr, size_t size)
 {
-	if (last_frame + ALIGN_UP(size, PAGE_SIZE) > KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
-		panic("Unable to map physical memory %p (%" PRIs " bytes)", physaddr, size)
+	if (last_frame + ALIGN_UP(size, PAGE_SIZE) >
+	    KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
+		panic("Unable to map physical memory %p (%" PRIs " bytes)",
+		    physaddr, size)
 	
 	uintptr_t virtaddr = PA2KA(last_frame);
 	pfn_t i;
 	for (i = 0; i < ADDR2PFN(ALIGN_UP(size, PAGE_SIZE)); i++)
-		page_mapping_insert(AS_KERNEL, virtaddr + PFN2ADDR(i), physaddr + PFN2ADDR(i), PAGE_NOT_CACHEABLE | PAGE_WRITE);
+		page_mapping_insert(AS_KERNEL, virtaddr + PFN2ADDR(i),
+		    physaddr + PFN2ADDR(i), PAGE_NOT_CACHEABLE | PAGE_WRITE);
 	
 	last_frame = ALIGN_UP(last_frame + size, FRAME_SIZE);
Index: kernel/arch/ppc32/src/mm/tlb.c
===================================================================
--- kernel/arch/ppc32/src/mm/tlb.c	(revision f4c2b6a104d4ab9ce057413b12ff1efedcba0fcd)
+++ kernel/arch/ppc32/src/mm/tlb.c	(revision 7560b606cea3b9fdec24aa6444d3e37011f2d025)
@@ -48,14 +48,17 @@
  * if lock is true.
  *
- * @param as       Address space.
- * @param lock     Lock/unlock the address space.
- * @param badvaddr Faulting virtual address.
- * @param access   Access mode that caused the fault.
- * @param istate   Pointer to interrupted state.
- * @param pfrc     Pointer to variable where as_page_fault() return code will be stored.
- * @return         PTE on success, NULL otherwise.
- *
- */
-static pte_t *find_mapping_and_check(as_t *as, bool lock, uintptr_t badvaddr, int access, istate_t *istate, int *pfrc)
+ * @param as		Address space.
+ * @param lock		Lock/unlock the address space.
+ * @param badvaddr	Faulting virtual address.
+ * @param access	Access mode that caused the fault.
+ * @param istate	Pointer to interrupted state.
+ * @param pfrc		Pointer to variable where as_page_fault() return code
+ * 			will be stored.
+ * @return		PTE on success, NULL otherwise.
+ *
+ */
+static pte_t *
+find_mapping_and_check(as_t *as, bool lock, uintptr_t badvaddr, int access,
+    istate_t *istate, int *pfrc)
 {
 	/*
@@ -78,25 +81,25 @@
 		page_table_unlock(as, lock);
 		switch (rc = as_page_fault(badvaddr, access, istate)) {
-			case AS_PF_OK:
-				/*
-				 * The higher-level page fault handler succeeded,
-				 * The mapping ought to be in place.
-				 */
-				page_table_lock(as, lock);
-				pte = page_mapping_find(as, badvaddr);
-				ASSERT((pte) && (pte->p));
-				*pfrc = 0;
-				return pte;
-			case AS_PF_DEFER:
-				page_table_lock(as, lock);
-				*pfrc = rc;
-				return NULL;
-			case AS_PF_FAULT:
-				page_table_lock(as, lock);
-				printf("Page fault.\n");
-				*pfrc = rc;
-				return NULL;
-			default:
-				panic("unexpected rc (%d)\n", rc);
+		case AS_PF_OK:
+			/*
+			 * The higher-level page fault handler succeeded,
+			 * The mapping ought to be in place.
+			 */
+			page_table_lock(as, lock);
+			pte = page_mapping_find(as, badvaddr);
+			ASSERT((pte) && (pte->p));
+			*pfrc = 0;
+			return pte;
+		case AS_PF_DEFER:
+			page_table_lock(as, lock);
+			*pfrc = rc;
+			return NULL;
+		case AS_PF_FAULT:
+			page_table_lock(as, lock);
+			printf("Page fault.\n");
+			*pfrc = rc;
+			return NULL;
+		default:
+			panic("unexpected rc (%d)\n", rc);
 		}	
 	}
@@ -115,5 +118,6 @@
 	if (s)
 		sym2 = s;
-	panic("%p: PHT Refill Exception at %p (%s<-%s)\n", badvaddr, istate->pc, symbol, sym2);
+	panic("%p: PHT Refill Exception at %p (%s<-%s)\n", badvaddr,
+	    istate->pc, symbol, sym2);
 }
 
@@ -148,5 +152,6 @@
 	   PTE in PTEG */
 	for (i = 0; i < 8; i++) {
-		if ((!phte[base + i].v) || ((phte[base + i].vsid == vsid) && (phte[base + i].api == api))) {
+		if ((!phte[base + i].v) || ((phte[base + i].vsid == vsid) &&
+		    (phte[base + i].api == api))) {
 			found = true;
 			break;
@@ -161,5 +166,7 @@
 		   PTE in PTEG */
 		for (i = 0; i < 8; i++) {
-			if ((!phte[base2 + i].v) || ((phte[base2 + i].vsid == vsid) && (phte[base2 + i].api == api))) {
+			if ((!phte[base2 + i].v) ||
+			    ((phte[base2 + i].vsid == vsid) &&
+			    (phte[base2 + i].api == api))) {
 				found = true;
 				base = base2;
@@ -215,5 +222,7 @@
 	   PTE in PTEG */
 	for (i = 0; i < 8; i++) {
-		if ((!phte_physical[base + i].v) || ((phte_physical[base + i].vsid == vsid) && (phte_physical[base + i].api == api))) {
+		if ((!phte_physical[base + i].v) ||
+		    ((phte_physical[base + i].vsid == vsid) &&
+		    (phte_physical[base + i].api == api))) {
 			found = true;
 			break;
@@ -228,5 +237,7 @@
 		   PTE in PTEG */
 		for (i = 0; i < 8; i++) {
-			if ((!phte_physical[base2 + i].v) || ((phte_physical[base2 + i].vsid == vsid) && (phte_physical[base2 + i].api == api))) {
+			if ((!phte_physical[base2 + i].v) ||
+			    ((phte_physical[base2 + i].vsid == vsid) &&
+			    (phte_physical[base2 + i].api == api))) {
 				found = true;
 				base = base2;
@@ -255,6 +266,6 @@
 /** Process Instruction/Data Storage Interrupt
  *
- * @param n Interrupt vector number.
- * @param istate Interrupted register context.
+ * @param n		Interrupt vector number.
+ * @param istate	Interrupted register context.
  *
  */
@@ -285,19 +296,20 @@
 	page_table_lock(as, lock);
 	
-	pte = find_mapping_and_check(as, lock, badvaddr, PF_ACCESS_READ /* FIXME */, istate, &pfrc);
+	pte = find_mapping_and_check(as, lock, badvaddr,
+	    PF_ACCESS_READ /* FIXME */, istate, &pfrc);
 	if (!pte) {
 		switch (pfrc) {
-			case AS_PF_FAULT:
-				goto fail;
-				break;
-			case AS_PF_DEFER:
-				/*
-		 		 * The page fault came during copy_from_uspace()
-				 * or copy_to_uspace().
-				 */
-				page_table_unlock(as, lock);
-				return;
-			default:
-				panic("Unexpected pfrc (%d)\n", pfrc);
+		case AS_PF_FAULT:
+			goto fail;
+			break;
+		case AS_PF_DEFER:
+			/*
+			 * The page fault came during copy_from_uspace()
+			 * or copy_to_uspace().
+			 */
+			page_table_unlock(as, lock);
+			return;
+		default:
+			panic("Unexpected pfrc (%d)\n", pfrc);
 		}
 	}
@@ -317,6 +329,6 @@
 /** Process Instruction/Data Storage Interrupt in Real Mode
  *
- * @param n Interrupt vector number.
- * @param istate Interrupted register context.
+ * @param n		Interrupt vector number.
+ * @param istate	Interrupted register context.
  *
  */
@@ -374,5 +386,6 @@
 	uint32_t i;
 	for (i = 0; i < 8192; i++) {
-		if ((phte[i].v) && (phte[i].vsid >= (asid << 4)) && (phte[i].vsid < ((asid << 4) + 16)))
+		if ((phte[i].v) && (phte[i].vsid >= (asid << 4)) &&
+		    (phte[i].vsid < ((asid << 4) + 16)))
 			phte[i].v = 0;
 	}
@@ -408,5 +421,9 @@
 	} else \
 		length = 0; \
-	printf(name ": page=%.*p frame=%.*p length=%d KB (mask=%#x)%s%s\n", sizeof(upper) * 2, upper & 0xffff0000, sizeof(lower) * 2, lower & 0xffff0000, length, mask, ((upper >> 1) & 1) ? " supervisor" : "", (upper & 1) ? " user" : "");
+	printf(name ": page=%.*p frame=%.*p length=%d KB (mask=%#x)%s%s\n", \
+	    sizeof(upper) * 2, upper & 0xffff0000, sizeof(lower) * 2, \
+	    lower & 0xffff0000, length, mask, \
+	    ((upper >> 1) & 1) ? " supervisor" : "", \
+	    (upper & 1) ? " user" : "");
 
 
@@ -422,5 +439,8 @@
 			: "r" (sr << 28)
 		);
-		printf("vsid[%d]: VSID=%.*p (ASID=%d)%s%s\n", sr, sizeof(vsid) * 2, vsid & 0xffffff, (vsid & 0xffffff) >> 4, ((vsid >> 30) & 1) ? " supervisor" : "", ((vsid >> 29) & 1) ? " user" : "");
+		printf("vsid[%d]: VSID=%.*p (ASID=%d)%s%s\n", sr,
+		    sizeof(vsid) * 2, vsid & 0xffffff, (vsid & 0xffffff) >> 4,
+		    ((vsid >> 30) & 1) ? " supervisor" : "",
+		    ((vsid >> 29) & 1) ? " user" : "");
 	}