diff options
| author | Andreas Schwab <aschwab@redhat.com> | 2009-07-02 12:02:12 +0200 |
|---|---|---|
| committer | Andreas Schwab <aschwab@redhat.com> | 2009-07-02 12:02:12 +0200 |
| commit | 8c9533e18f842a79512d38b11662a1ed2355c6a8 (patch) | |
| tree | b34e8c0b58e27bba8a276ff76e5c846d53c20bf9 /sysdeps/x86_64/multiarch/init-arch.h | |
| parent | ffd515a6e7a265a63dd40037db66e80c1f243099 (diff) | |
| parent | 2fd0cd8b5257e7ae0c0df0651ee62a6ef7c37cc2 (diff) | |
Merge commit 'origin/master' into fedora/master
Conflicts:
ChangeLog
Diffstat (limited to 'sysdeps/x86_64/multiarch/init-arch.h')
| -rw-r--r-- | sysdeps/x86_64/multiarch/init-arch.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sysdeps/x86_64/multiarch/init-arch.h b/sysdeps/x86_64/multiarch/init-arch.h index 5c4892de38..48a2127418 100644 --- a/sysdeps/x86_64/multiarch/init-arch.h +++ b/sysdeps/x86_64/multiarch/init-arch.h @@ -42,6 +42,8 @@ extern struct cpu_features unsigned int ecx; unsigned int edx; } cpuid[COMMON_CPUID_INDEX_MAX]; + unsigned int family; + unsigned int model; } __cpu_features attribute_hidden; |