Index: kernel/arch/ia32/include/smp/mps.h
===================================================================
--- kernel/arch/ia32/include/smp/mps.h	(revision e3038b41e1f6e1ef905bbc80916933e18d3e3008)
+++ kernel/arch/ia32/include/smp/mps.h	(revision 49eb6818bdc4c8415ca4893642646cd5a99d5555)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32	
+/** @addtogroup ia32
  * @{
  */
@@ -41,6 +41,6 @@
 #include <arch/smp/smp.h>
 
-#define CT_EXT_ENTRY_TYPE		0
-#define CT_EXT_ENTRY_LEN		1
+#define CT_EXT_ENTRY_TYPE  0
+#define CT_EXT_ENTRY_LEN   1
 
 struct mps_fs {
@@ -70,5 +70,5 @@
 	uint16_t ext_table_length;
 	uint8_t ext_table_checksum;
-	uint8_t xxx;
+	uint8_t reserved;
 	uint8_t base_table[0];
 } __attribute__ ((packed));
@@ -81,5 +81,5 @@
 	uint8_t cpu_signature[4];
 	uint32_t feature_flags;
-	uint32_t xxx[2];
+	uint32_t reserved[2];
 } __attribute__ ((packed));
 
@@ -102,5 +102,5 @@
 	uint8_t intr_type;
 	uint8_t poel;
-	uint8_t xxx;
+	uint8_t reserved;
 	uint8_t src_bus_id;
 	uint8_t src_bus_irq;
@@ -113,5 +113,5 @@
 	uint8_t intr_type;
 	uint8_t poel;
-	uint8_t xxx;
+	uint8_t reserved;
 	uint8_t src_bus_id;
 	uint8_t src_bus_irq;
Index: kernel/arch/ia32/src/ia32.c
===================================================================
--- kernel/arch/ia32/src/ia32.c	(revision e3038b41e1f6e1ef905bbc80916933e18d3e3008)
+++ kernel/arch/ia32/src/ia32.c	(revision 49eb6818bdc4c8415ca4893642646cd5a99d5555)
@@ -139,5 +139,5 @@
 {
 #ifdef CONFIG_SMP
-        if (config.cpu_active > 1) {
+	if (config.cpu_active > 1) {
 		l_apic_init();
 		l_apic_debug();
Index: kernel/genarch/include/acpi/acpi.h
===================================================================
--- kernel/genarch/include/acpi/acpi.h	(revision e3038b41e1f6e1ef905bbc80916933e18d3e3008)
+++ kernel/genarch/include/acpi/acpi.h	(revision 49eb6818bdc4c8415ca4893642646cd5a99d5555)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup genarch	
+/** @addtogroup genarch
  * @{
  */
Index: kernel/genarch/include/acpi/madt.h
===================================================================
--- kernel/genarch/include/acpi/madt.h	(revision e3038b41e1f6e1ef905bbc80916933e18d3e3008)
+++ kernel/genarch/include/acpi/madt.h	(revision 49eb6818bdc4c8415ca4893642646cd5a99d5555)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup genarch	
+/** @addtogroup genarch
  * @{
  */
@@ -40,16 +40,16 @@
 #include <arch/smp/smp.h>
 
-#define	MADT_L_APIC			0
-#define MADT_IO_APIC			1
-#define MADT_INTR_SRC_OVRD		2
-#define MADT_NMI_SRC			3
-#define MADT_L_APIC_NMI			4
-#define MADT_L_APIC_ADDR_OVRD		5
-#define MADT_IO_SAPIC			6
-#define MADT_L_SAPIC			7
-#define MADT_PLATFORM_INTR_SRC		8
-#define MADT_RESERVED_SKIP_BEGIN	9
-#define MADT_RESERVED_SKIP_END		127
-#define MADT_RESERVED_OEM_BEGIN		128
+#define MADT_L_APIC               0
+#define MADT_IO_APIC              1
+#define MADT_INTR_SRC_OVRD        2
+#define MADT_NMI_SRC              3
+#define MADT_L_APIC_NMI           4
+#define MADT_L_APIC_ADDR_OVRD     5
+#define MADT_IO_SAPIC             6
+#define MADT_L_SAPIC              7
+#define MADT_PLATFORM_INTR_SRC    8
+#define MADT_RESERVED_SKIP_BEGIN  9
+#define MADT_RESERVED_SKIP_END    127
+#define MADT_RESERVED_OEM_BEGIN   128
 
 struct madt_apic_header {
@@ -57,5 +57,4 @@
 	uint8_t length;
 } __attribute__ ((packed));
-
 
 /* Multiple APIC Description Table */
@@ -71,5 +70,5 @@
 	uint8_t acpi_id;
 	uint8_t apic_id;
-	uint32_t flags;	
+	uint32_t flags;
 } __attribute__ ((packed));
 
@@ -78,5 +77,5 @@
 	uint8_t io_apic_id;
 	uint8_t reserved;
-	uint32_t io_apic_address;	
+	uint32_t io_apic_address;
 	uint32_t global_intr_base;
 } __attribute__ ((packed));
@@ -114,5 +113,5 @@
 	uint8_t reserved;
 	uint32_t global_intr_base;
-	uint64_t io_apic_address;		
+	uint64_t io_apic_address;
 } __attribute__ ((packed));
 
Index: kernel/generic/include/smp/ipi.h
===================================================================
--- kernel/generic/include/smp/ipi.h	(revision e3038b41e1f6e1ef905bbc80916933e18d3e3008)
+++ kernel/generic/include/smp/ipi.h	(revision 49eb6818bdc4c8415ca4893642646cd5a99d5555)
@@ -43,5 +43,5 @@
 #else
 
-	#define ipi_broadcast(ipi)
+#define ipi_broadcast(ipi)
 
 #endif /* CONFIG_SMP */
Index: kernel/generic/src/main/kinit.c
===================================================================
--- kernel/generic/src/main/kinit.c	(revision e3038b41e1f6e1ef905bbc80916933e18d3e3008)
+++ kernel/generic/src/main/kinit.c	(revision 49eb6818bdc4c8415ca4893642646cd5a99d5555)
@@ -107,4 +107,5 @@
 	if (config.cpu_count > 1) {
 		waitq_initialize(&ap_completion_wq);
+		
 		/*
 		 * Create the kmp thread and wait for its completion.
@@ -124,12 +125,10 @@
 		thread_join(thread);
 		thread_detach(thread);
-	}
-	
-	if (config.cpu_count > 1) {
+		
+		/*
+		 * For each CPU, create its load balancing thread.
+		 */
 		size_t i;
 		
-		/*
-		 * For each CPU, create its load balancing thread.
-		 */
 		for (i = 0; i < config.cpu_count; i++) {
 			thread = thread_create(kcpulb, NULL, TASK, THREAD_FLAG_WIRED, "kcpulb", true);
Index: kernel/generic/src/mm/tlb.c
===================================================================
--- kernel/generic/src/mm/tlb.c	(revision e3038b41e1f6e1ef905bbc80916933e18d3e3008)
+++ kernel/generic/src/mm/tlb.c	(revision 49eb6818bdc4c8415ca4893642646cd5a99d5555)
@@ -94,4 +94,5 @@
 		
 		cpu_t *cpu = &cpus[i];
+		
 		irq_spinlock_lock(&cpu->lock, false);
 		if (cpu->tlb_messages_count == TLB_MESSAGE_QUEUE_LEN) {
@@ -121,7 +122,8 @@
 	
 busy_wait:
-	for (i = 0; i < config.cpu_count; i++)
+	for (i = 0; i < config.cpu_count; i++) {
 		if (cpus[i].tlb_active)
 			goto busy_wait;
+	}
 	
 	return ipl;