Index: kernel/arch/ia32/include/arch/asm.h
===================================================================
--- kernel/arch/ia32/include/arch/asm.h	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
+++ kernel/arch/ia32/include/arch/asm.h	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -52,5 +52,5 @@
 	while (true) {
 		asm volatile (
-			"hlt\n"
+		    "hlt\n"
 		);
 	}
@@ -60,5 +60,5 @@
 {
 	asm volatile (
-		"hlt\n"
+	    "hlt\n"
 	);
 }
@@ -117,6 +117,6 @@
 	if (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
 		asm volatile (
-			"outb %b[val], %w[port]\n"
-			:: [val] "a" (val), [port] "d" (port)
+		    "outb %b[val], %w[port]\n"
+		    :: [val] "a" (val), [port] "d" (port)
 		);
 	} else
@@ -136,6 +136,6 @@
 	if (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
 		asm volatile (
-			"outw %w[val], %w[port]\n"
-			:: [val] "a" (val), [port] "d" (port)
+		    "outw %w[val], %w[port]\n"
+		    :: [val] "a" (val), [port] "d" (port)
 		);
 	} else
@@ -155,6 +155,6 @@
 	if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
 		asm volatile (
-			"outl %[val], %w[port]\n"
-			:: [val] "a" (val), [port] "d" (port)
+		    "outl %[val], %w[port]\n"
+		    :: [val] "a" (val), [port] "d" (port)
 		);
 	} else
@@ -176,7 +176,7 @@
 
 		asm volatile (
-			"inb %w[port], %b[val]\n"
-			: [val] "=a" (val)
-			: [port] "d" (port)
+		    "inb %w[port], %b[val]\n"
+		    : [val] "=a" (val)
+		    : [port] "d" (port)
 		);
 
@@ -200,7 +200,7 @@
 
 		asm volatile (
-			"inw %w[port], %w[val]\n"
-			: [val] "=a" (val)
-			: [port] "d" (port)
+		    "inw %w[port], %w[val]\n"
+		    : [val] "=a" (val)
+		    : [port] "d" (port)
 		);
 
@@ -224,7 +224,7 @@
 
 		asm volatile (
-			"inl %w[port], %[val]\n"
-			: [val] "=a" (val)
-			: [port] "d" (port)
+		    "inl %w[port], %[val]\n"
+		    : [val] "=a" (val)
+		    : [port] "d" (port)
 		);
 
@@ -239,7 +239,7 @@
 
 	asm volatile (
-		"pushf\n"
-		"popl %[v]\n"
-		: [v] "=r" (eflags)
+	    "pushf\n"
+	    "popl %[v]\n"
+	    : [v] "=r" (eflags)
 	);
 
@@ -250,7 +250,7 @@
 {
 	asm volatile (
-		"pushl %[v]\n"
-		"popf\n"
-		:: [v] "r" (eflags)
+	    "pushl %[v]\n"
+	    "popf\n"
+	    :: [v] "r" (eflags)
 	);
 }
@@ -326,8 +326,8 @@
 {
 	asm volatile (
-		"wrmsr"
-		:: "c" (msr),
-		   "a" ((uint32_t) (value)),
-		   "d" ((uint32_t) (value >> 32))
+	    "wrmsr"
+	    :: "c" (msr),
+	      "a" ((uint32_t) (value)),
+	      "d" ((uint32_t) (value >> 32))
 	);
 }
@@ -338,8 +338,8 @@
 
 	asm volatile (
-		"rdmsr"
-		: "=a" (ax),
-		  "=d" (dx)
-		: "c" (msr)
+	    "rdmsr"
+	    : "=a" (ax),
+	      "=d" (dx)
+	    : "c" (msr)
 	);
 
@@ -362,7 +362,7 @@
 
 	asm volatile (
-		"andl %%esp, %[v]\n"
-		: [v] "=r" (v)
-		: "0" (~(STACK_SIZE - 1))
+	    "andl %%esp, %[v]\n"
+	    : [v] "=r" (v)
+	    : "0" (~(STACK_SIZE - 1))
 	);
 
@@ -378,6 +378,6 @@
 {
 	asm volatile (
-		"invlpg %[addr]\n"
-		:: [addr] "m" (*(sysarg_t *) addr)
+	    "invlpg %[addr]\n"
+	    :: [addr] "m" (*(sysarg_t *) addr)
 	);
 }
@@ -391,6 +391,6 @@
 {
 	asm volatile (
-		"lgdtl %[gdtr_reg]\n"
-		:: [gdtr_reg] "m" (*gdtr_reg)
+	    "lgdtl %[gdtr_reg]\n"
+	    :: [gdtr_reg] "m" (*gdtr_reg)
 	);
 }
@@ -404,6 +404,6 @@
 {
 	asm volatile (
-		"sgdtl %[gdtr_reg]\n"
-		: [gdtr_reg] "=m" (*gdtr_reg)
+	    "sgdtl %[gdtr_reg]\n"
+	    : [gdtr_reg] "=m" (*gdtr_reg)
 	);
 }
@@ -417,6 +417,6 @@
 {
 	asm volatile (
-		"lidtl %[idtr_reg]\n"
-		:: [idtr_reg] "m" (*idtr_reg)
+	    "lidtl %[idtr_reg]\n"
+	    :: [idtr_reg] "m" (*idtr_reg)
 	);
 }
@@ -430,6 +430,6 @@
 {
 	asm volatile (
-		"ltr %[sel]"
-		:: [sel] "r" (sel)
+	    "ltr %[sel]"
+	    :: [sel] "r" (sel)
 	);
 }
@@ -443,6 +443,6 @@
 {
 	asm volatile (
-		"mov %[sel], %%gs"
-		:: [sel] "r" (sel)
+	    "mov %[sel], %%gs"
+	    :: [sel] "r" (sel)
 	);
 }
Index: kernel/arch/ia32/src/cpu/cpu.c
===================================================================
--- kernel/arch/ia32/src/cpu/cpu.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
+++ kernel/arch/ia32/src/cpu/cpu.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -101,9 +101,9 @@
 	if (CPU->arch.fi.bits.sse) {
 		asm volatile (
-			"mov %%cr4, %[help]\n"
-			"or %[mask], %[help]\n"
-			"mov %[help], %%cr4\n"
-			: [help] "+r" (help)
-			: [mask] "i" (CR4_OSFXSR | CR4_OSXMMEXCPT)
+		    "mov %%cr4, %[help]\n"
+		    "or %[mask], %[help]\n"
+		    "mov %[help], %%cr4\n"
+		    : [help] "+r" (help)
+		    : [mask] "i" (CR4_OSFXSR | CR4_OSXMMEXCPT)
 		);
 	}
@@ -128,7 +128,7 @@
 		 * Check for AMD processor.
 		 */
-		if ((info.cpuid_ebx == AMD_CPUID_EBX)
-		    && (info.cpuid_ecx == AMD_CPUID_ECX)
-		    && (info.cpuid_edx == AMD_CPUID_EDX))
+		if ((info.cpuid_ebx == AMD_CPUID_EBX) &&
+		    (info.cpuid_ecx == AMD_CPUID_ECX) &&
+		    (info.cpuid_edx == AMD_CPUID_EDX))
 			CPU->arch.vendor = VendorAMD;
 
@@ -136,7 +136,7 @@
 		 * Check for Intel processor.
 		 */
-		if ((info.cpuid_ebx == INTEL_CPUID_EBX)
-		    && (info.cpuid_ecx == INTEL_CPUID_ECX)
-		    && (info.cpuid_edx == INTEL_CPUID_EDX))
+		if ((info.cpuid_ebx == INTEL_CPUID_EBX) &&
+		    (info.cpuid_ecx == INTEL_CPUID_ECX) &&
+		    (info.cpuid_edx == INTEL_CPUID_EDX))
 			CPU->arch.vendor = VendorIntel;
 
@@ -148,9 +148,9 @@
 }
 
-void cpu_print_report(cpu_t* cpu)
+void cpu_print_report(cpu_t *cpu)
 {
 	printf("cpu%u: (%s family=%u model=%u stepping=%u apicid=%u) %" PRIu16
-		" MHz\n", cpu->id, vendor_str[cpu->arch.vendor], cpu->arch.family,
-		cpu->arch.model, cpu->arch.stepping, cpu->arch.id, cpu->frequency_mhz);
+	    " MHz\n", cpu->id, vendor_str[cpu->arch.vendor], cpu->arch.family,
+	    cpu->arch.model, cpu->arch.stepping, cpu->arch.id, cpu->frequency_mhz);
 }
 
Index: kernel/arch/ia32/src/ia32.c
===================================================================
--- kernel/arch/ia32/src/ia32.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
+++ kernel/arch/ia32/src/ia32.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -200,6 +200,6 @@
 	outdev_t **ns16550_out_ptr = NULL;
 #endif
-	ns16550_instance_t *ns16550_instance
-	    = ns16550_init(NS16550_BASE, 0, IRQ_NS16550, NULL, NULL,
+	ns16550_instance_t *ns16550_instance =
+	    ns16550_init(NS16550_BASE, 0, IRQ_NS16550, NULL, NULL,
 	    ns16550_out_ptr);
 	if (ns16550_instance) {