Index: kernel/arch/ia64/src/drivers/ski.c
===================================================================
--- kernel/arch/ia64/src/drivers/ski.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
+++ kernel/arch/ia64/src/drivers/ski.c	(revision f712a858b9463dae30e9eee5ef1ccc54ae618f02)
@@ -84,11 +84,11 @@
 
 	asm volatile (
-		"mov r15 = %1\n"
-		"break 0x80000;;\n"  /* modifies r8 */
-		"mov %0 = r8;;\n"
-
-		: "=r" (ch)
-		: "i" (SKI_GETCHAR)
-		: "r15", "r8"
+	    "mov r15 = %1\n"
+	    "break 0x80000;;\n"  /* modifies r8 */
+	    "mov %0 = r8;;\n"
+
+	    : "=r" (ch)
+	    : "i" (SKI_GETCHAR)
+	    : "r15", "r8"
 	);
 
@@ -143,9 +143,9 @@
 
 	asm volatile (
-		"mov r15 = %0\n"
-		"break 0x80000\n"
-		:
-		: "i" (SKI_INIT_CONSOLE)
-		: "r15", "r8"
+	    "mov r15 = %0\n"
+	    "break 0x80000\n"
+	    :
+	    : "i" (SKI_INIT_CONSOLE)
+	    : "r15", "r8"
 	);
 
@@ -169,10 +169,10 @@
 {
 	asm volatile (
-		"mov r15 = %[cmd]\n"
-		"mov r32 = %[ch]\n"   /* r32 is in0 */
-		"break 0x80000\n"     /* modifies r8 */
-		:
-		: [cmd] "i" (SKI_PUTCHAR), [ch] "r" (ch)
-		: "r15", "in0", "r8"
+	    "mov r15 = %[cmd]\n"
+	    "mov r32 = %[ch]\n"   /* r32 is in0 */
+	    "break 0x80000\n"     /* modifies r8 */
+	    :
+	    : [cmd] "i" (SKI_PUTCHAR), [ch] "r" (ch)
+	    : "r15", "in0", "r8"
 	);
 }
Index: kernel/arch/ia64/src/ia64.c
===================================================================
--- kernel/arch/ia64/src/ia64.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
+++ kernel/arch/ia64/src/ia64.c	(revision f712a858b9463dae30e9eee5ef1ccc54ae618f02)
@@ -181,6 +181,6 @@
 
 #ifdef CONFIG_NS16550
-	ns16550_instance_t *ns16550_instance
-	    = ns16550_init(NS16550_BASE, 0, NS16550_IRQ, NULL, NULL,
+	ns16550_instance_t *ns16550_instance =
+	    ns16550_init(NS16550_BASE, 0, NS16550_IRQ, NULL, NULL,
 	    NULL);
 	if (ns16550_instance) {
@@ -253,5 +253,6 @@
 	    (uintptr_t) kernel_uarg->uspace_uarg, psr.value, rsc.value);
 
-	while (true);
+	while (true)
+		;
 }
 
@@ -259,5 +260,6 @@
 {
 	pio_write_8((ioport8_t *)0x64, 0xfe);
-	while (true);
+	while (true)
+		;
 }
 
Index: kernel/arch/ia64/src/interrupt.c
===================================================================
--- kernel/arch/ia64/src/interrupt.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
+++ kernel/arch/ia64/src/interrupt.c	(revision f712a858b9463dae30e9eee5ef1ccc54ae618f02)
@@ -229,5 +229,5 @@
 {
 	asm volatile (
-		"mov cr.eoi = r0 ;;"
+	    "mov cr.eoi = r0 ;;"
 	);
 }
@@ -245,5 +245,5 @@
 	case INTERRUPT_SPURIOUS:
 #ifdef CONFIG_DEBUG
- 		printf("cpu%d: spurious interrupt\n", CPU->id);
+		printf("cpu%d: spurious interrupt\n", CPU->id);
 #endif
 		break;