patch-2.3.15 linux/arch/i386/kernel/setup.c

• Lines: 46
• Date: Wed Aug 25 15:49:00 1999
• Orig file: v2.3.14/linux/arch/i386/kernel/setup.c
• Orig date: Wed Aug 18 11:25:12 1999

diff -u --recursive --new-file v2.3.14/linux/arch/i386/kernel/setup.c linux/arch/i386/kernel/setup.c
@@ -584,6 +584,19 @@
 				break;
 			}
 			break;
+		case 6:	/* An Athlon. We can trust the BIOS probably */
+		{
+			
+			u32 ecx, edx, dummy;
+			cpuid(0x80000005, &dummy, &dummy, &ecx, &edx);
+			printk("L1 I Cache: %dK  L1 D Cache: %dK\n",
+				ecx>>24, edx>>24);
+			cpuid(0x80000006, &dummy, &dummy, &ecx, &edx);
+			printk("L2 Cache: %dK\n", ecx>>16);
+			c->x86_cache_size = ecx>>16;
+			break;
+		}
+		
 	}
 	return r;
 }
@@ -805,6 +818,11 @@
 	    "K5", "K5", NULL, NULL,
 	    "K6", "K6", "K6-2",
 	    "K6-3", NULL, NULL, NULL, NULL, NULL, NULL }},
+	{ X86_VENDOR_AMD,	6,
+	  { "Athlon", "Athlon",
+	    NULL, NULL, NULL, NULL,
+	    NULL, NULL, NULL,
+	    NULL, NULL, NULL, NULL, NULL, NULL, NULL }},
 	{ X86_VENDOR_UMC,	4,
 	  { NULL, "U5D", "U5S", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 	    NULL, NULL, NULL, NULL, NULL, NULL }},
@@ -1116,11 +1134,11 @@
 	struct tss_struct * t = &init_tss[nr];
 
 	if (test_and_set_bit(nr,&cpu_initialized)) {
-		printk("CPU#%d ALREADY INITIALIZED!!!!!!!!!\n", nr);
+		printk("CPU#%d already initialized!\n", nr);
 		for (;;) __sti();
 	}
 	cpus_initialized++;
-	printk("INITIALIZING CPU#%d\n", nr);
+	printk("Initializing CPU#%d\n", nr);
 
 	if (boot_cpu_data.x86_capability & X86_FEATURE_PSE)
 		clear_in_cr4(X86_CR4_VME|X86_CR4_PVI|X86_CR4_TSD|X86_CR4_DE);