Index: kernel/arch/arm32/src/ras.c
===================================================================
--- kernel/arch/arm32/src/ras.c	(revision 8cbf1c333889cf14d44353c7d7d73d9dbf0441a3)
+++ kernel/arch/arm32/src/ras.c	(revision e2a0d76262c824f700198bedc668eb60c9ab9cfa)
@@ -51,13 +51,12 @@
 void ras_init(void)
 {
-	uintptr_t frame;
-
-	frame = frame_alloc(ONE_FRAME,
+	uintptr_t frame = frame_alloc(ONE_FRAME,
 	    FRAME_ATOMIC | FRAME_HIGHMEM, 0);
 	if (!frame)
 		frame = frame_alloc(ONE_FRAME, FRAME_LOWMEM, 0);
+	
 	ras_page = (uintptr_t *) km_map(frame,
 	    PAGE_SIZE, PAGE_READ | PAGE_WRITE | PAGE_USER | PAGE_CACHEABLE);
-
+	
 	memsetb(ras_page, PAGE_SIZE, 0); 
 	ras_page[RAS_START] = 0;
Index: kernel/arch/ia64/src/mm/vhpt.c
===================================================================
--- kernel/arch/ia64/src/mm/vhpt.c	(revision 8cbf1c333889cf14d44353c7d7d73d9dbf0441a3)
+++ kernel/arch/ia64/src/mm/vhpt.c	(revision e2a0d76262c824f700198bedc668eb60c9ab9cfa)
@@ -46,4 +46,5 @@
 	if (!vhpt_base)
 		panic("Kernel configured with VHPT but no memory for table.");
+	
 	vhpt_invalidate_all();
 	return (uintptr_t) vhpt_base;
Index: kernel/arch/mips32/include/arch/mm/page.h
===================================================================
--- kernel/arch/mips32/include/arch/mm/page.h	(revision 8cbf1c333889cf14d44353c7d7d73d9dbf0441a3)
+++ kernel/arch/mips32/include/arch/mm/page.h	(revision e2a0d76262c824f700198bedc668eb60c9ab9cfa)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32mm	
+/** @addtogroup mips32mm
  * @{
  */
@@ -70,10 +70,10 @@
  * - PTL3 has 4096 entries (12 bits)
  */
- 
+
 /* Macros describing number of entries in each level. */
-#define PTL0_ENTRIES_ARCH	64
-#define PTL1_ENTRIES_ARCH	0
-#define PTL2_ENTRIES_ARCH	0
-#define PTL3_ENTRIES_ARCH	4096
+#define PTL0_ENTRIES_ARCH  64
+#define PTL1_ENTRIES_ARCH  0
+#define PTL2_ENTRIES_ARCH  0
+#define PTL3_ENTRIES_ARCH  4096
 
 /* Macros describing size of page tables in each level. */
@@ -84,13 +84,13 @@
 
 /* Macros calculating entry indices for each level. */
-#define PTL0_INDEX_ARCH(vaddr)	((vaddr) >> 26) 
-#define PTL1_INDEX_ARCH(vaddr)	0
-#define PTL2_INDEX_ARCH(vaddr)	0
-#define PTL3_INDEX_ARCH(vaddr)	(((vaddr) >> 14) & 0xfff)
+#define PTL0_INDEX_ARCH(vaddr)  ((vaddr) >> 26)
+#define PTL1_INDEX_ARCH(vaddr)  0
+#define PTL2_INDEX_ARCH(vaddr)  0
+#define PTL3_INDEX_ARCH(vaddr)  (((vaddr) >> 14) & 0xfff)
 
 /* Set accessor for PTL0 address. */
 #define SET_PTL0_ADDRESS_ARCH(ptl0)
 
-/* Get PTE address accessors for each level. */ 
+/* Get PTE address accessors for each level. */
 #define GET_PTL1_ADDRESS_ARCH(ptl0, i) \
 	(((pte_t *) (ptl0))[(i)].pfn << 12)
Index: kernel/arch/sparc64/src/mm/sun4u/as.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4u/as.c	(revision 8cbf1c333889cf14d44353c7d7d73d9dbf0441a3)
+++ kernel/arch/sparc64/src/mm/sun4u/as.c	(revision e2a0d76262c824f700198bedc668eb60c9ab9cfa)
@@ -72,5 +72,4 @@
 	
 	uintptr_t tsb = PA2KA(frame_alloc(order, flags, 0));
-	
 	if (!tsb)
 		return -1;
Index: kernel/arch/sparc64/src/mm/sun4v/as.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4v/as.c	(revision 8cbf1c333889cf14d44353c7d7d73d9dbf0441a3)
+++ kernel/arch/sparc64/src/mm/sun4v/as.c	(revision e2a0d76262c824f700198bedc668eb60c9ab9cfa)
@@ -70,5 +70,4 @@
 	
 	uintptr_t tsb = frame_alloc(order, flags, 0);
-	
 	if (!tsb)
 		return -1;
Index: kernel/doc/mm
===================================================================
--- kernel/doc/mm	(revision 8cbf1c333889cf14d44353c7d7d73d9dbf0441a3)
+++ kernel/doc/mm	(revision e2a0d76262c824f700198bedc668eb60c9ab9cfa)
@@ -71,5 +71,5 @@
 
 'malloc' function accepts flags as a second argument. The flags are directly
-passed to the underlying frame_alloc function. 
+passed to the underlying frame_alloc function.
 
 1) If the flags parameter contains FRAME_ATOMIC, the allocator will not sleep.
Index: kernel/genarch/src/mm/as_pt.c
===================================================================
--- kernel/genarch/src/mm/as_pt.c	(revision 8cbf1c333889cf14d44353c7d7d73d9dbf0441a3)
+++ kernel/genarch/src/mm/as_pt.c	(revision e2a0d76262c824f700198bedc668eb60c9ab9cfa)
@@ -82,5 +82,4 @@
 		/*
 		 * Copy the kernel address space portion to new PTL0.
-		 *
 		 */
 		
Index: kernel/genarch/src/mm/page_pt.c
===================================================================
--- kernel/genarch/src/mm/page_pt.c	(revision 8cbf1c333889cf14d44353c7d7d73d9dbf0441a3)
+++ kernel/genarch/src/mm/page_pt.c	(revision e2a0d76262c824f700198bedc668eb60c9ab9cfa)
@@ -363,12 +363,14 @@
  * @param size Size in bytes defining the range of PTL0 entries that will be
  *             altered by this function.
+ *
  */
 void pt_mapping_make_global(uintptr_t base, size_t size)
 {
+	ASSERT(size > 0);
+	
 	uintptr_t ptl0 = PA2KA((uintptr_t) AS_KERNEL->genarch.page_table);
 	uintptr_t ptl0_step = ptl0_step_get();
 	size_t order;
-	uintptr_t addr;
-
+	
 #if (PTL1_ENTRIES != 0)
 	order = PTL1_SIZE;
@@ -378,12 +380,9 @@
 	order = PTL3_SIZE;
 #endif
-
-	ASSERT(size > 0);
-
-	for (addr = ALIGN_DOWN(base, ptl0_step); addr - 1 < base + size - 1;
+	
+	for (uintptr_t addr = ALIGN_DOWN(base, ptl0_step);
+	    addr - 1 < base + size - 1;
 	    addr += ptl0_step) {
-		uintptr_t l1;
-
-		l1 = PA2KA(frame_alloc(order, FRAME_LOWMEM, 0));
+		uintptr_t l1 = PA2KA(frame_alloc(order, FRAME_LOWMEM, 0));
 		memsetb((void *) l1, FRAME_SIZE << order, 0);
 		SET_PTL1_ADDRESS(ptl0, PTL0_INDEX(addr), KA2PA(l1));
Index: kernel/generic/include/config.h
===================================================================
--- kernel/generic/include/config.h	(revision 8cbf1c333889cf14d44353c7d7d73d9dbf0441a3)
+++ kernel/generic/include/config.h	(revision e2a0d76262c824f700198bedc668eb60c9ab9cfa)
@@ -45,5 +45,5 @@
 #define STACK_SIZE    ((1 << STACK_FRAMES) << PAGE_WIDTH)
 
-#define STACK_SIZE_USER	(1 * 1024 * 1024)
+#define STACK_SIZE_USER  (1 * 1024 * 1024)
 
 #define CONFIG_INIT_TASKS        32
Index: kernel/generic/include/mm/slab.h
===================================================================
--- kernel/generic/include/mm/slab.h	(revision 8cbf1c333889cf14d44353c7d7d73d9dbf0441a3)
+++ kernel/generic/include/mm/slab.h	(revision e2a0d76262c824f700198bedc668eb60c9ab9cfa)
@@ -90,4 +90,5 @@
 	
 	/* Configuration */
+	
 	/** Size of slab position - align_up(sizeof(obj)) */
 	size_t size;
Index: kernel/generic/src/ddi/ddi.c
===================================================================
--- kernel/generic/src/ddi/ddi.c	(revision 8cbf1c333889cf14d44353c7d7d73d9dbf0441a3)
+++ kernel/generic/src/ddi/ddi.c	(revision e2a0d76262c824f700198bedc668eb60c9ab9cfa)
@@ -327,12 +327,12 @@
 	ASSERT(TASK);
 	
-	size_t pages = SIZE2FRAMES(size);
+	size_t frames = SIZE2FRAMES(size);
 	uint8_t order;
 	
-	/* We need the 2^order >= pages */
-	if (pages == 1)
+	/* We need the 2^order >= frames */
+	if (frames == 1)
 		order = 0;
 	else
-		order = fnzb(pages - 1) + 1;
+		order = fnzb(frames - 1) + 1;
 	
 	*phys = frame_alloc_noreserve(order, 0, 0);
@@ -342,5 +342,5 @@
 	mem_backend_data_t backend_data;
 	backend_data.base = *phys;
-	backend_data.frames = pages;
+	backend_data.frames = frames;
 	
 	if (!as_area_create(TASK->as, map_flags, size,
Index: kernel/generic/src/debug/stacktrace.c
===================================================================
--- kernel/generic/src/debug/stacktrace.c	(revision 8cbf1c333889cf14d44353c7d7d73d9dbf0441a3)
+++ kernel/generic/src/debug/stacktrace.c	(revision e2a0d76262c824f700198bedc668eb60c9ab9cfa)
@@ -39,5 +39,5 @@
 #include <print.h>
 
-#define STACK_FRAMES_MAX	20
+#define STACK_FRAMES_MAX  20
 
 void stack_trace_ctx(stack_trace_ops_t *ops, stack_trace_context_t *ctx)
@@ -49,6 +49,6 @@
 	uintptr_t pc;
 	
-	while (cnt++ < STACK_FRAMES_MAX &&
-	    ops->stack_trace_context_validate(ctx)) {
+	while ((cnt++ < STACK_FRAMES_MAX) &&
+	    (ops->stack_trace_context_validate(ctx))) {
 		if (ops->symbol_resolve &&
 		    ops->symbol_resolve(ctx->pc, &symbol, &offset)) {
Index: kernel/generic/src/mm/km.c
===================================================================
--- kernel/generic/src/mm/km.c	(revision 8cbf1c333889cf14d44353c7d7d73d9dbf0441a3)
+++ kernel/generic/src/mm/km.c	(revision e2a0d76262c824f700198bedc668eb60c9ab9cfa)
@@ -239,29 +239,30 @@
 uintptr_t km_temporary_page_get(uintptr_t *framep, frame_flags_t flags)
 {
-	uintptr_t frame;
-	uintptr_t page;
-
 	ASSERT(THREAD);
 	ASSERT(framep);
 	ASSERT(!(flags & ~(FRAME_NO_RESERVE | FRAME_ATOMIC)));
-
+	
 	/*
 	 * Allocate a frame, preferably from high memory.
 	 */
-	frame = frame_alloc(ONE_FRAME,
+	uintptr_t page;
+	uintptr_t frame = frame_alloc(ONE_FRAME,
 	    FRAME_HIGHMEM | FRAME_ATOMIC | flags, 0); 
 	if (frame) {
 		page = km_map(frame, PAGE_SIZE,
 		    PAGE_READ | PAGE_WRITE | PAGE_CACHEABLE);
-		ASSERT(page);	// FIXME
+		
+		// FIXME
+		ASSERT(page);
 	} else {
 		frame = frame_alloc(ONE_FRAME, FRAME_LOWMEM | flags, 0);
 		if (!frame)
 			return (uintptr_t) NULL;
+		
 		page = PA2KA(frame);
 	}
-
+	
 	*framep = frame;
-	return page;	
+	return page;
 }
 
Index: kernel/generic/src/mm/slab.c
===================================================================
--- kernel/generic/src/mm/slab.c	(revision 8cbf1c333889cf14d44353c7d7d73d9dbf0441a3)
+++ kernel/generic/src/mm/slab.c	(revision e2a0d76262c824f700198bedc668eb60c9ab9cfa)
@@ -184,7 +184,6 @@
 	void *data = (void *)
 	    PA2KA(frame_alloc_generic(cache->order, flags, 0, &zone));
-	if (!data) {
+	if (!data)
 		return NULL;
-	}
 	
 	slab_t *slab;
Index: kernel/test/mm/mapping1.c
===================================================================
--- kernel/test/mm/mapping1.c	(revision 8cbf1c333889cf14d44353c7d7d73d9dbf0441a3)
+++ kernel/test/mm/mapping1.c	(revision e2a0d76262c824f700198bedc668eb60c9ab9cfa)
@@ -43,5 +43,4 @@
 	uintptr_t page0, page1;
 	uint32_t v;
-	int i;
 	
 	uintptr_t frame = frame_alloc(ONE_FRAME, FRAME_NONE, 0);
@@ -56,13 +55,13 @@
 	    (void *) page1, (void *) frame);
 	
-	for (i = 0; i < 2; i++) {
+	for (unsigned int i = 0; i < 2; i++) {
 		TPRINTF("Writing magic using the first virtual address.\n");
-
+		
 		*((uint32_t *) page0) = TEST_MAGIC;
-
+		
 		TPRINTF("Reading magic using the second virtual address.\n");
-
+		
 		v = *((uint32_t *) page1);
-	
+		
 		if (v != TEST_MAGIC) {
 			km_unmap(page0, PAGE_SIZE);
@@ -71,13 +70,13 @@
 			return "Criss-cross read does not match the value written.";
 		}
-
+		
 		TPRINTF("Writing zero using the second virtual address.\n");
-	
+		
 		*((uint32_t *) page1) = 0;
-
+		
 		TPRINTF("Reading zero using the first virtual address.\n");
-	
+		
 		v = *((uint32_t *) page0);
-	
+		
 		if (v != 0) {
 			km_unmap(page0, PAGE_SIZE);
@@ -87,5 +86,5 @@
 		}
 	}
-
+	
 	km_unmap(page0, PAGE_SIZE);
 	km_unmap(page1, PAGE_SIZE);