From 983bd49f11eb674b42a3971e7c49c4b78c51d8e1 Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Wed, 3 Dec 2014 17:09:43 -0800
Subject: [PATCH] opal_timer_require_monotinic: change to bool / level 5

---
 opal/mca/timer/base/base.h            | 3 ++-
 opal/mca/timer/base/timer_base_open.c | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/opal/mca/timer/base/base.h b/opal/mca/timer/base/base.h
index a129130bdb..be32fac70b 100644
--- a/opal/mca/timer/base/base.h
+++ b/opal/mca/timer/base/base.h
@@ -9,6 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -39,7 +40,7 @@ OPAL_DECLSPEC extern mca_base_framework_t opal_timer_base_framework;
 /**
  * MCA param to force monotonic timers.
  */
-OPAL_DECLSPEC extern int mca_timer_base_monotonic;
+OPAL_DECLSPEC extern bool mca_timer_base_monotonic;
 
 END_C_DECLS
 
diff --git a/opal/mca/timer/base/timer_base_open.c b/opal/mca/timer/base/timer_base_open.c
index c7e8941f1c..0102f41262 100644
--- a/opal/mca/timer/base/timer_base_open.c
+++ b/opal/mca/timer/base/timer_base_open.c
@@ -9,6 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -22,7 +23,7 @@
 #include "opal/constants.h"
 #include "opal/mca/timer/base/base.h"
 
-int mca_timer_base_monotonic = 1;
+bool mca_timer_base_monotonic = true;
 
 /*
  * The following file was created by configure.  It contains extern
@@ -35,8 +36,8 @@ static int mca_timer_base_register(mca_base_register_flag_t flags)
 {
     (void) mca_base_var_register("opal", "timer", "require", "monotonic",
                                  "Node-level monotonic timer required (default yes)",
-                                 MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
-                                 OPAL_INFO_LVL_9,
+                                 MCA_BASE_VAR_TYPE_BOOL, NULL, 0, 0,
+                                 OPAL_INFO_LVL_5,
                                  MCA_BASE_VAR_SCOPE_LOCAL,
                                  &mca_timer_base_monotonic);