Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 3c3b73b6f50a47601b1897deb9c6b4b5ecadf591

Authored by Zwane Mwaikambo
Committed by Linus Torvalds
1 parent 2f1b381825
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[PATCH] cpuid x87 bit on AMD falsely marked as PNI 

http://bugme.osdl.org/show_bug.cgi?id=4426

vendor_id       : AuthenticAMD
cpu family      : 6
model           : 10
model name      : AMD Athlon(tm) XP
stepping        : 0
cpu MHz         : 2204.807
<snipped>
cpuid level     : 1
wp              : yes
flags           : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov
pat pse36 mmx fxsr sse pni syscall mmxext 3dnowext 3dnow
bogomips        : 4358.14

We're marking bit 0 of extended function 0x80000001 cpuid as PNI support on
AMD processors, when it actually denotes x87 FPU present.  Patch for i386
and x86_64 below.

Signed-off-by: Zwane Mwaikambo <zwane@arm.linux.org.uk>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff

arch/i386/kernel/cpu/proc.c
Diff comments   View file @ 3c3b73b
... ... @@ -25,7 +25,7 @@
25 25 "fxsr", "sse", "sse2", "ss", "ht", "tm", "ia64", "pbe",
26 26  
27 27 /* AMD-defined */
28   - "pni", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
  28 + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
29 29 NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL,
30 30 NULL, NULL, NULL, "mp", "nx", NULL, "mmxext", NULL,
31 31 NULL, "fxsr_opt", NULL, NULL, NULL, "lm", "3dnowext", "3dnow",
arch/x86_64/kernel/setup.c
Diff comments   View file @ 3c3b73b
... ... @@ -1076,7 +1076,7 @@
1076 1076 "fxsr", "sse", "sse2", "ss", "ht", "tm", "ia64", NULL,
1077 1077  
1078 1078 /* AMD-defined */
1079   - "pni", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
  1079 + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
1080 1080 NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL,
1081 1081 NULL, NULL, NULL, NULL, "nx", NULL, "mmxext", NULL,
1082 1082 NULL, "fxsr_opt", NULL, NULL, NULL, "lm", "3dnowext", "3dnow",