[gentoo-commits] gentoo-x86 commit in dev-util/oprofile/files: oprofile-1.0.0-athlon.patch

[Andrew Savchenko (bircoph)]

bircoph     14/12/01 06:39:59

  Added:                oprofile-1.0.0-athlon.patch
  Log:
  Version bump to 1.0.0 per bug 530754
  
  Signed-off-by: Andrew Savchenko <bircoph@g.o>
  (Portage version: 2.2.14/cvs/Linux i686, signed Manifest commit with key 565953B95372756C)

Revision  Changes    Path
1.1                  dev-util/oprofile/files/oprofile-1.0.0-athlon.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/oprofile/files/oprofile-1.0.0-athlon.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/oprofile/files/oprofile-1.0.0-athlon.patch?rev=1.1&content-type=text/plain

Index: oprofile-1.0.0-athlon.patch
===================================================================
Fix AMD Athlon CPU family recognition.
See upstream bug 275 for details:
https://sourceforge.net/p/oprofile/bugs/275/
--- oprofile-1.0.0/libop/op_cpu_type.c.orig	2014-09-12 18:39:47.000000000 +0400
+++ oprofile-1.0.0/libop/op_cpu_type.c	2014-11-30 18:29:00.328342552 +0300
@@ -538,10 +538,13 @@
 	family = cpu_family(eax);
 
 	/* These family does not exist in the past.*/
-	if (family < 0x0f || family == 0x13)
+	if (family < 0x0f && family != 0x6 || family == 0x13)
 		return ret;
 
 	switch (family) {
+	case 0x6:
+		ret = op_get_cpu_number("i386/athlon");
+		break;
 	case 0x0f:
 		ret = op_get_cpu_number("x86-64/hammer");
 		break;