From: Vincent Brillault <git@lerya.net>
Date: Sat, 20 Sep 2014 17:08:40 +0000 (+0200)
Subject: Turbostat: fix allocate_cpu_set
X-Git-Tag: collectd-5.5.0~24^2~40
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=259df7455bea78ebff3bab37fb27fb1bba79f87a

Turbostat: fix allocate_cpu_set
---

diff --git a/src/turbostat.c b/src/turbostat.c
index 6995df55..328d129d 100644
--- a/src/turbostat.c
+++ b/src/turbostat.c
@@ -1168,14 +1168,14 @@ mark_cpu_present(int cpu)
 }
 
 static int __attribute__((warn_unused_result))
-allocate_cpu_set(cpu_set_t * set, size_t * size) {
-	set = CPU_ALLOC(topology.max_cpu_id  + 1);
-	if (set == NULL) {
+allocate_cpu_set(cpu_set_t ** set, size_t * size) {
+	*set = CPU_ALLOC(topology.max_cpu_id  + 1);
+	if (*set == NULL) {
 		ERROR("Unable to allocate CPU state");
 		return -ERR_CPU_ALLOC;
 	}
 	*size = CPU_ALLOC_SIZE(topology.max_cpu_id  + 1);
-	CPU_ZERO_S(*size, set);
+	CPU_ZERO_S(*size, *set);
 	return 0;
 }
 
@@ -1204,13 +1204,13 @@ topology_probe()
 		return -ERR_CALLOC;
 	}
 
-	ret = allocate_cpu_set(cpu_present_set, &cpu_present_setsize);
+	ret = allocate_cpu_set(&cpu_present_set, &cpu_present_setsize);
 	if (ret != 0)
 		goto err;
-	ret = allocate_cpu_set(cpu_affinity_set, &cpu_affinity_setsize);
+	ret = allocate_cpu_set(&cpu_affinity_set, &cpu_affinity_setsize);
 	if (ret != 0)
 		goto err;
-	ret = allocate_cpu_set(cpu_saved_affinity_set, &cpu_saved_affinity_setsize);
+	ret = allocate_cpu_set(&cpu_saved_affinity_set, &cpu_saved_affinity_setsize);
 	if (ret != 0)
 		goto err;