Browse Source

Merge commit 'fd83783' into bfgminer-3.10.x

Luke Dashjr 11 years ago
parent
commit
b8fc254466
2 changed files with 6 additions and 3 deletions
  1. 2 0
      AUTHORS
  2. 4 3
      driver-cpu.c

+ 2 - 0
AUTHORS

@@ -46,6 +46,8 @@ pontus <liquidpontus@yahoo.se>
 Nico Oelgart <nico@nicoswd.com>
 Tydus <Tydus@Tydus.org>
 Raulo <p987341@gmail.com>
+Kiyoaki Matsugae <matsugae.kiyoaki@gmail.com>
+Lauri Kasanen <curaga@operamail.com>
 Thorsten Gilling <tgilling@web.de>
 Isidoro Ghezzi <isidoro.ghezzi@icloud.com>
 Colin Percival

+ 4 - 3
driver-cpu.c

@@ -49,6 +49,7 @@ BFG_REGISTER_DRIVER(cpu_drv)
 static inline void drop_policy(void)
 {
 	struct sched_param param;
+	param.sched_priority = 0;
 
 #ifdef SCHED_BATCH
 #ifdef SCHED_IDLE
@@ -64,7 +65,7 @@ static inline void affine_to_cpu(int id, int cpu)
 
 	CPU_ZERO(&set);
 	CPU_SET(cpu, &set);
-	sched_setaffinity(0, sizeof(&set), &set);
+	sched_setaffinity(0, sizeof(set), &set);
 	applog(LOG_INFO, "Binding cpu mining thread %d to cpu %d", id, cpu);
 }
 #else
@@ -741,10 +742,10 @@ static int cpu_autodetect()
 	}
 	#elif defined(_SC_NPROCESSORS_ONLN)
 		num_processors = sysconf(_SC_NPROCESSORS_ONLN);
-	#elif defined(HW_NCPU)
+	#elif defined(CTL_HW) && defined(HW_NCPU)
 		int req[] = { CTL_HW, HW_NCPU };
 		size_t len = sizeof(num_processors);
-		v = sysctl(req, 2, &num_processors, &len, NULL, 0);
+		sysctl(req, 2, &num_processors, &len, NULL, 0);
 	#else
 		num_processors = 1;
 	#endif /* !WIN32 */