about summary refs log tree commit diff
path: root/sysdeps/x86_64/multiarch/sched_cpucount.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-05-31 17:52:05 -0700
committerUlrich Drepper <drepper@redhat.com>2009-05-31 17:52:05 -0700
commit963cb6fcb47ca212c0c57cc57bd7510f6549579c (patch)
treee0b12d2f0af3a97193aaa12a7162e6c38b828a4f /sysdeps/x86_64/multiarch/sched_cpucount.c
parentfd469aac31dc09f1328c8c4b976f887ebd592c56 (diff)
downloadglibc-963cb6fcb47ca212c0c57cc57bd7510f6549579c.tar.gz
glibc-963cb6fcb47ca212c0c57cc57bd7510f6549579c.tar.xz
glibc-963cb6fcb47ca212c0c57cc57bd7510f6549579c.zip
Simplify CPUID value handling.
SO far Intel and AMD use exactly the same bits meaning the same
things in CPUID index 1.  Simplify the code.  Should an architecture
come along which doesn't use the same semantics then it must use a
different index value than COMMON_CPUID_INDEX_1.
Diffstat (limited to 'sysdeps/x86_64/multiarch/sched_cpucount.c')
-rw-r--r--sysdeps/x86_64/multiarch/sched_cpucount.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sysdeps/x86_64/multiarch/sched_cpucount.c b/sysdeps/x86_64/multiarch/sched_cpucount.c
index dc20182df4..e7f9daed05 100644
--- a/sysdeps/x86_64/multiarch/sched_cpucount.c
+++ b/sysdeps/x86_64/multiarch/sched_cpucount.c
@@ -1,6 +1,6 @@
 /* Count bits in CPU set.  x86-64 multi-arch version.
    This file is part of the GNU C Library.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@redhat.com>.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -35,8 +35,7 @@
 # undef __sched_cpucount
 
 libc_ifunc (__sched_cpucount,
-	    INTEL_HAS_POPCOUNT || AMD_HAS_POPCOUNT
-	    ? popcount_cpucount : generic_cpucount);
+	    HAS_POPCOUNT ? popcount_cpucount : generic_cpucount);
 #else
 # include_next <sched_cpucount.c>
 #endif