From 7221da3796145cf778ded56024c5e1efa00a3901 Mon Sep 17 00:00:00 2001 From: Daniel Gollub Date: Thu, 1 May 2014 14:07:01 +0200 Subject: [PATCH] Replace CONFIG_CPU_COUNT with plain CPU_COUNT Fixes double-declartion issue of CPU_COUNT when fio.h is included by third-party projects. Checking for a define of CPU_COUNT seems to be a common approach to deal with different versions of sched.h Signed-off-by: Daniel Gollub Signed-off-by: Jens Axboe --- configure | 19 ------------------- os/os.h | 2 +- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/configure b/configure index 4757d670..2ba1dafe 100755 --- a/configure +++ b/configure @@ -651,22 +651,6 @@ fi echo "sched_setaffinity(3 arg) $linux_3arg_affinity" echo "sched_setaffinity(2 arg) $linux_2arg_affinity" -########################################## -# CPU_COUNT test -cpu_count="no" -cat > $TMPC << EOF -#include -int main(int argc, char **argv) -{ - cpu_set_t mask; - return CPU_COUNT(&mask); -} -EOF -if compile_prog "" "" "cpu_count"; then - cpu_count="yes" -fi -echo "CPU_COUNT $cpu_count" - ########################################## # clock_gettime probe clock_gettime="no" @@ -1335,9 +1319,6 @@ fi if test "$rbd" = "yes" ; then output_sym "CONFIG_RBD" fi -if test "$cpu_count" = "yes" ; then - output_sym "CONFIG_CPU_COUNT" -fi if test "$setvbuf" = "yes" ; then output_sym "CONFIG_SETVBUF" fi diff --git a/os/os.h b/os/os.h index 2f2d0698..98b45321 100644 --- a/os/os.h +++ b/os/os.h @@ -321,7 +321,7 @@ static inline unsigned int cpus_online(void) } #endif -#ifndef CONFIG_CPU_COUNT +#ifndef CPU_COUNT #ifdef FIO_HAVE_CPU_AFFINITY static inline int CPU_COUNT(os_cpu_mask_t *mask) { -- 2.25.1