X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Frculfhash.c;h=7c0b9fb8081fbfd4db089def5665d01d7b6cda90;hb=5cfe81b7ddff9543d451746de9965cac58c67182;hp=8046f3a63a280397be3986231f1db8921ea4bfdb;hpb=4c10e9af6fb29192621372ab9077860f3c1b179f;p=userspace-rcu.git

diff --git a/src/rculfhash.c b/src/rculfhash.c
index 8046f3a..7c0b9fb 100644
--- a/src/rculfhash.c
+++ b/src/rculfhash.c
@@ -281,6 +281,7 @@
 #include "workqueue.h"
 #include "urcu-die.h"
 #include "urcu-utils.h"
+#include "compat-smp.h"
 
 /*
  * Split-counters lazily update the global counter each 1024
@@ -645,12 +646,11 @@ static long nr_cpus_mask = -1;
 static long split_count_mask = -1;
 static int split_count_order = -1;
 
-#if defined(HAVE_SYSCONF)
 static void ht_init_nr_cpus_mask(void)
 {
 	long maxcpus;
 
-	maxcpus = sysconf(_SC_NPROCESSORS_CONF);
+	maxcpus = get_possible_cpus_array_len();
 	if (maxcpus <= 0) {
 		nr_cpus_mask = -2;
 		return;
@@ -662,12 +662,6 @@ static void ht_init_nr_cpus_mask(void)
 	maxcpus = 1UL << cds_lfht_get_count_order_ulong(maxcpus);
 	nr_cpus_mask = maxcpus - 1;
 }
-#else /* #if defined(HAVE_SYSCONF) */
-static void ht_init_nr_cpus_mask(void)
-{
-	nr_cpus_mask = -2;
-}
-#endif /* #else #if defined(HAVE_SYSCONF) */
 
 static
 void alloc_split_items_count(struct cds_lfht *ht)
@@ -763,7 +757,7 @@ void ht_count_del(struct cds_lfht *ht, unsigned long size, unsigned long hash)
 
 	if ((count >> CHAIN_LEN_RESIZE_THRESHOLD) >= size)
 		return;
-	dbg_printf("del set global %ld\n", count);
+	dbg_printf("del set global %lu\n", count);
 	/*
 	 * Don't shrink table if the number of nodes is below a
 	 * certain threshold.