 +  CPU_ZERO(&mask);
 +  CPU_SET(mapped_affinity, &mask);
 +  if (cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1,
-+            sizeof(mask), &mask)) {
-+   perror("cpuset_setaffinity failed");
-+   fflush(stderr);
++			 sizeof(mask), &mask)) {
++	perror("cpuset_setaffinity failed");
++	fflush(stderr);
 +  }
 +#endif /* __FreeBSD_version */    
  #else

-#define OMNI_ARGS "aBb:cCd:De:FgG:hH:i:Ij:kK:l:L:m:M:nNoOp:P:r:R:s:S:t:T:u:UVw:W:46"
+#define OMNI_ARGS "aBb:cCd:De:FgG:hH:i:Ij:kK:l:L:m:M:nNoOp:P:r:R:s:S:t:T:u:UVw:W:X:46"
 
   extern char  *optarg;      /* pointer to option string   */
 
@@ -7218,6 +7262,13 @@
       test_uuid[sizeof(test_uuid) - 1] = 0;

 #ifdef HAVE_MPCTL
@@ -2378,7 +2382,7 @@ bind_to_specific_processor(int processor
     if ((mapped_affinity < 0) ||
 	(mapped_affinity > MAXIMUM_PROCESSORS)) {
       fprintf(where,
-	      "Invalid processor_affinity specified: %d\n", mapped_affinity);      fflush(where);
+	      "Invalid use_cpu_affinity specified: %d\n", mapped_affinity);      fflush(where);
       return;
     }
 
