From 33c09b30c216623ec054f4f628bcd3ae93a13255 Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Wed, 26 Mar 2008 11:22:57 +0000
Subject: [PATCH] Patch from George: ensure that we don't overwrite
 timer_linux_happy improperly when checking the host type.

This commit was SVN r17975.
---
 opal/mca/timer/linux/configure.m4 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/opal/mca/timer/linux/configure.m4 b/opal/mca/timer/linux/configure.m4
index a931442dd2..472a560a9f 100644
--- a/opal/mca/timer/linux/configure.m4
+++ b/opal/mca/timer/linux/configure.m4
@@ -47,7 +47,10 @@ AC_DEFUN([MCA_timer_linux_CONFIG],[
 
    case "${host}" in
    i?86-*|x86_64*|ia64-*|powerpc-*|powerpc64-*|sparc*-*)
-        timer_linux_happy="yes"
+        AS_IF([test "$timer_linux_happy" = "yes"],
+              [AS_IF([test -r "/proc/cpuinfo"],
+                     [timer_linux_happy="yes"],
+                     [timer_linux_happy="no"])])
         ;;
    *)
         timer_linux_happy="no"