Index: kernel/arch/ia32/src/cpu/cpu.c
===================================================================
--- kernel/arch/ia32/src/cpu/cpu.c	(revision f2ef7fd587b7ec8f9d3293862101dfa7dbf2ecf6)
+++ kernel/arch/ia32/src/cpu/cpu.c	(revision 8b972569a2527f24b6772411479a5edde4bd00a4)
@@ -66,6 +66,6 @@
 static char *vendor_str[] = {
 	"Unknown Vendor",
-	"AuthenticAMD",
-	"GenuineIntel"
+	"AMD",
+	"Intel"
 };
 
@@ -78,5 +78,5 @@
 		:
 		:
-		:"%eax"
+		: "%eax"
 	);
 }
@@ -90,5 +90,5 @@
 		:
 		:
-		:"%eax"
+		: "%eax"
 	);	
 }
@@ -141,27 +141,29 @@
 		 * 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;
-		}
-
+		
 		/*
 		 * 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;
-		}
-				
+		
 		cpuid(1, &info);
-		CPU->arch.family = (info.cpuid_eax>>8)&0xf;
-		CPU->arch.model = (info.cpuid_eax>>4)&0xf;
-		CPU->arch.stepping = (info.cpuid_eax>>0)&0xf;						
+		CPU->arch.family = (info.cpuid_eax >> 8) & 0x0f;
+		CPU->arch.model = (info.cpuid_eax >> 4) & 0x0f;
+		CPU->arch.stepping = (info.cpuid_eax >> 0) & 0x0f;						
 	}
 }
 
-void cpu_print_report(cpu_t* m)
+void cpu_print_report(cpu_t* cpu)
 {
-	printf("cpu%d: (%s family=%d model=%d stepping=%d) %dMHz\n",
-		m->id, vendor_str[m->arch.vendor], m->arch.family, m->arch.model, m->arch.stepping,
-		m->frequency_mhz);
+	printf("cpu%u: (%s family=%u model=%u stepping=%u) %" PRIu16 " MHz\n",
+		cpu->id, vendor_str[cpu->arch.vendor], cpu->arch.family,
+		cpu->arch.model, cpu->arch.stepping, cpu->frequency_mhz);
 }