Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <yanhuas@jyc1.(none)>
Wed, 25 Jan 2012 03:28:40 +0000 (21:28 -0600)
committerYanhua Sun <yanhuas@jyc1.(none)>
Wed, 25 Jan 2012 03:28:40 +0000 (21:28 -0600)
src/arch/gemini_gni-crayxe/conv-mach.h

index ecb81725a4bbdb0e1058f50bc9a9f859a52b2899..cb2e80c04b9f94ec5d9465aece12626a741f4861 100644 (file)
@@ -58,8 +58,8 @@
    implement the timer primitives. */
 #define CMK_TIMER_USE_RTC                                  0
 #define CMK_TIMER_USE_RDTSC                                0
-#define CMK_TIMER_USE_GETRUSAGE                            1
-#define CMK_TIMER_USE_SPECIAL                              0
+#define CMK_TIMER_USE_GETRUSAGE                            0
+#define CMK_TIMER_USE_SPECIAL                              1
 #define CMK_TIMER_USE_TIMES                                0
 #define CMK_TIMER_USE_BLUEGENEL                            0