Post-merge trivial fixes.

src/drivers/driver_common/driver_common.c

@@ -165,7 +165,7 @@ struct starpu_task *_starpu_get_worker_task(struct _starpu_worker *args, int wor
 		 * from popping a task from the scheduler to blocking. Otherwise the
 		 * driver may go block just after the scheduler got a new task to be
 		 * executed, and thus hanging. */
-		_STARPU_PTHREAD_MUTEX_LOCK(args->sched_mutex);
+		_STARPU_PTHREAD_MUTEX_LOCK(&args->sched_mutex);
 
 		if (_starpu_worker_get_status(workerid) != STATUS_SLEEPING)
 		{
@@ -175,7 +175,9 @@ struct starpu_task *_starpu_get_worker_task(struct _starpu_worker *args, int wor
 		}
 
 		if (_starpu_worker_can_block(memnode))
-			_STARPU_PTHREAD_COND_WAIT(args->sched_cond, args->sched_mutex);
+		{
+			_STARPU_PTHREAD_COND_WAIT(&args->sched_cond, &args->sched_mutex);
+		}
 		else
 		{
 			_starpu_clock_gettime(&start_time[workerid]);
@@ -183,7 +185,7 @@ struct starpu_task *_starpu_get_worker_task(struct _starpu_worker *args, int wor
 			idle[workerid] = 1;
 			
 		}
-		_STARPU_PTHREAD_MUTEX_UNLOCK(args->sched_mutex);
+		_STARPU_PTHREAD_MUTEX_UNLOCK(&args->sched_mutex);
 
 		return NULL;
 	}

src/sched_policies/detect_combined_workers.c

@@ -587,7 +587,7 @@ static void find_and_assign_combinations_without_hwloc(int *workerids, int nwork
     {
 	    worker = _starpu_get_worker_struct(workerids[i]);
 	   
-	    if (worker.perf_arch == STARPU_CPU_DEFAULT)
+	    if (worker->perf_arch == STARPU_CPU_DEFAULT)
 		    cpu_workers[ncpus++] = i;
     }
 
@@ -608,7 +608,7 @@ static void find_and_assign_combinations_without_hwloc(int *workerids, int nwork
 		int newworkerid;
 		newworkerid = starpu_combined_worker_assign_workerid(size, workerids);
 		STARPU_ASSERT(newworkerid >= 0);
-		workers->add(workers, bewworkerid);
+		workers->add(workers, newworkerid);
 	    }
 	}
     }