Index: kernel/arch/abs32le/include/arch/mm/page.h
===================================================================
--- kernel/arch/abs32le/include/arch/mm/page.h	(revision 3cf22f98e8b62fe3239495266885864a48c85a80)
+++ kernel/arch/abs32le/include/arch/mm/page.h	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -152,6 +152,5 @@
 	pte_t *p = &pt[i];
 
-	return (
-	    ((unsigned int) (!p->page_cache_disable) << PAGE_CACHEABLE_SHIFT) |
+	return (((unsigned int) (!p->page_cache_disable) << PAGE_CACHEABLE_SHIFT) |
 	    ((unsigned int) (!p->present) << PAGE_PRESENT_SHIFT) |
 	    ((unsigned int) p->uaccessible << PAGE_USER_SHIFT) |
@@ -159,6 +158,5 @@
 	    ((unsigned int) p->writeable << PAGE_WRITE_SHIFT) |
 	    (1 << PAGE_EXEC_SHIFT) |
-	    ((unsigned int) p->global << PAGE_GLOBAL_SHIFT)
-	);
+	    ((unsigned int) p->global << PAGE_GLOBAL_SHIFT));
 }
 
Index: kernel/arch/arm32/include/arch/cycle.h
===================================================================
--- kernel/arch/arm32/include/arch/cycle.h	(revision 3cf22f98e8b62fe3239495266885864a48c85a80)
+++ kernel/arch/arm32/include/arch/cycle.h	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -52,7 +52,10 @@
 	if ((ID_PFR1_read() & ID_PFR1_GEN_TIMER_EXT_MASK) ==
 	    ID_PFR1_GEN_TIMER_EXT) {
-	    uint32_t low = 0, high = 0;
-	    asm volatile( "MRRC p15, 0, %[low], %[high], c14": [low]"=r"(low), [high]"=r"(high));
-	   return ((uint64_t)high << 32) | low;
+		uint32_t low = 0, high = 0;
+		asm volatile (
+		    "MRRC p15, 0, %[low], %[high], c14"
+		    : [low] "=r" (low), [high] "=r" (high)
+		);
+		return ((uint64_t)high << 32) | low;
 	} else {
 		return (uint64_t)PMCCNTR_read() * 64;
Index: kernel/arch/arm32/src/mach/integratorcp/integratorcp.c
===================================================================
--- kernel/arch/arm32/src/mach/integratorcp/integratorcp.c	(revision 3cf22f98e8b62fe3239495266885864a48c85a80)
+++ kernel/arch/arm32/src/mach/integratorcp/integratorcp.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -245,5 +245,6 @@
 void icp_cpu_halt(void)
 {
-	while (true);
+	while (true)
+		;
 }
 
@@ -345,11 +346,11 @@
 
 #ifdef CONFIG_PL011_UART
-        srln_instance_t *srln_instance = srln_init();
-        if (srln_instance) {
-                indev_t *sink = stdin_wire();
-                indev_t *srln = srln_wire(srln_instance, sink);
-                pl011_uart_input_wire(&icp.uart, srln);
-                icp_irqc_unmask(ICP_UART0_IRQ);
-        }
+	srln_instance_t *srln_instance = srln_init();
+	if (srln_instance) {
+		indev_t *sink = stdin_wire();
+		indev_t *srln = srln_wire(srln_instance, sink);
+		pl011_uart_input_wire(&icp.uart, srln);
+		icp_irqc_unmask(ICP_UART0_IRQ);
+	}
 #endif
 }
Index: kernel/arch/ia64/src/mm/page.c
===================================================================
--- kernel/arch/ia64/src/mm/page.c	(revision 3cf22f98e8b62fe3239495266885864a48c85a80)
+++ kernel/arch/ia64/src/mm/page.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -75,5 +75,5 @@
 	 * For paranoia reasons, we set it again.
 	 */
-	for(i = 0; i < REGION_REGISTERS; i++) {
+	for (i = 0; i < REGION_REGISTERS; i++) {
 		rr.word = rr_read(i);
 		rr.map.ve = 0;		/* disable VHPT walker */
Index: kernel/arch/sparc64/include/arch/sun4v/hypercall.h
===================================================================
--- kernel/arch/sparc64/include/arch/sun4v/hypercall.h	(revision 3cf22f98e8b62fe3239495266885864a48c85a80)
+++ kernel/arch/sparc64/include/arch/sun4v/hypercall.h	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -152,5 +152,5 @@
  */
 static inline uint64_t
-    __hypercall_fast(const uint64_t p1, const uint64_t p2, const uint64_t p3,
+__hypercall_fast(const uint64_t p1, const uint64_t p2, const uint64_t p3,
     const uint64_t p4, const uint64_t p5, const uint64_t function_number)
 {
@@ -187,5 +187,5 @@
  */
 static inline uint64_t
-    __hypercall_fast_ret1(const uint64_t p1, const uint64_t p2, const uint64_t p3,
+__hypercall_fast_ret1(const uint64_t p1, const uint64_t p2, const uint64_t p3,
     const uint64_t p4, const uint64_t p5, const uint64_t function_number,
     uint64_t *ret1)
@@ -223,5 +223,5 @@
  */
 static inline uint64_t
-    __hypercall_hyperfast(const uint64_t p1, const uint64_t p2, const uint64_t p3,
+__hypercall_hyperfast(const uint64_t p1, const uint64_t p2, const uint64_t p3,
     const uint64_t p4, const uint64_t p5, const uint64_t sw_trap_number)
 {