Merge pull request #6872 from rhc54/topic/lsf2

rhc54 · web-flow · commit 6159afc07aab · 2019-08-07T07:07:25.000-07:00
Fix typos
diff --git a/orte/mca/ras/lsf/ras_lsf_module.c b/orte/mca/ras/lsf/ras_lsf_module.c
@@ -36,6 +36,7 @@
 
 #include "orte/mca/rmaps/rmaps_types.h"
 #include "orte/mca/errmgr/errmgr.h"
+#include "orte/mca/rmaps/base/base.h"
 #include "orte/runtime/orte_globals.h"
 #include "orte/util/show_help.h"
 
@@ -120,7 +121,7 @@ static int allocate(orte_job_t *jdata, opal_list_t *nodes)
             directives_given = true;
         }
     } else if ((ORTE_MAPPING_GIVEN & ORTE_GET_MAPPING_DIRECTIVE(orte_rmaps_base.mapping)) ||
-               OPAL_BINDING_POLICY_IS_SET(opal_hwloc_binding_policy) {
+               OPAL_BINDING_POLICY_IS_SET(opal_hwloc_binding_policy)) {
             directives_given = true;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@`
`36`	`36`
`37`	`37`	`#include "orte/mca/rmaps/rmaps_types.h"`
`38`	`38`	`#include "orte/mca/errmgr/errmgr.h"`
	`39`	`+#include "orte/mca/rmaps/base/base.h"`
`39`	`40`	`#include "orte/runtime/orte_globals.h"`
`40`	`41`	`#include "orte/util/show_help.h"`
`41`	`42`
`@@ -120,7 +121,7 @@ static int allocate(orte_job_t jdata, opal_list_t nodes)`
`120`	`121`	`directives_given = true;`
`121`	`122`	`}`
`122`	`123`	`} else if ((ORTE_MAPPING_GIVEN & ORTE_GET_MAPPING_DIRECTIVE(orte_rmaps_base.mapping)) \|\|`
`123`		`- OPAL_BINDING_POLICY_IS_SET(opal_hwloc_binding_policy) {`
	`124`	`+ OPAL_BINDING_POLICY_IS_SET(opal_hwloc_binding_policy)) {`
`124`	`125`	`directives_given = true;`
`125`	`126`	`}`
`126`	`127`