Merge branch 'master' of git+ssh://scm.gforge.inria.fr/gitroot/starpu/starpu

examples/perf_monitoring/perf_counters_02.c

@@ -172,7 +172,7 @@ int main(int argc, char **argv)
 	int v;
 	for (v=0; v<NVECTORS; v++)
 	{
-		vector[v] = calloc(VECTOR_LEN, sizeof(*vector));
+		vector[v] = calloc(VECTOR_LEN, sizeof(*(vector[v])));
 		STARPU_ASSERT(vector[v] != NULL);
 
 		{

examples/perf_steering/perf_knobs_03.c

@@ -116,7 +116,7 @@ int main(int argc, char **argv)
 		STARPU_ASSERT(starpu_perf_knob_get_type_id(id) == starpu_perf_knob_type_name_to_id(knob_type_name));
 
 		struct starpu_codelet cl = {
-			.cpu_func = cpu_func
+			.cpu_funcs = {cpu_func}
 		};
 
 		task_count[0] = 0;