Author: aurel32
Date: 2010-05-31 21:34:13 +0000 (Mon, 31 May 2010)
New Revision: 4309
Modified:
glibc-package/trunk/debian/patches/amd64/submitted-cpuid.diff
Log:
really backport amd64/submitted-cpuid.diff
Modified: glibc-package/trunk/debian/patches/amd64/submitted-cpuid.diff
===================================================================
--- glibc-package/trunk/debian/patches/amd64/submitted-cpuid.diff
2010-05-31 20:32:40 UTC (rev 4308)
+++ glibc-package/trunk/debian/patches/amd64/submitted-cpuid.diff
2010-05-31 21:34:13 UTC (rev 4309)
@@ -3,11 +3,9 @@
* sysdeps/x86_64/multiarch/init-arch.c (__init_cpu_features):
Properly check family and model.
-diff --git a/sysdeps/x86_64/multiarch/init-arch.c
b/sysdeps/x86_64/multiarch/init-arch.c
-index efb89b6..f13a9f4 100644
--- a/sysdeps/x86_64/multiarch/init-arch.c
+++ b/sysdeps/x86_64/multiarch/init-arch.c
-@@ -62,15 +62,15 @@ __init_cpu_features (void)
+@@ -62,12 +62,12 @@
unsigned int eax = __cpu_features.cpuid[COMMON_CPUID_INDEX_1].eax;
unsigned int extended_family = (eax >> 20) & 0xff;
unsigned int extended_model = (eax >> 12) & 0xf0;
@@ -19,11 +17,6 @@
}
- else if (__cpu_features.family == 0x06)
+ else if (family == 0x06)
- {
- model += extended_model;
-- switch (__cpu_features.model)
-+ switch (model)
- {
- case 0x1a:
- case 0x1e:
-
+ model += extended_model;
+ }
+ /* This spells out "AuthenticAMD". */
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
