diff -u openmpi-1.4.3/debian/changelog openmpi-1.4.3/debian/changelog --- openmpi-1.4.3/debian/changelog +++ openmpi-1.4.3/debian/changelog @@ -1,3 +1,9 @@ +openmpi (1.4.3-2.1ubuntu3) precise; urgency=low + + * debian/patches/arm_support: fix ARM timer code (LP: #949044). + + -- Leif Lindholm Tue, 27 Mar 2012 14:52:48 +0300 + openmpi (1.4.3-2.1ubuntu2) precise; urgency=low * Build using blcr on armhf. diff -u openmpi-1.4.3/debian/patches/arm_support openmpi-1.4.3/debian/patches/arm_support --- openmpi-1.4.3/debian/patches/arm_support +++ openmpi-1.4.3/debian/patches/arm_support @@ -255,7 +255,7 @@ =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-1.4.3/opal/include/opal/sys/arm/timer.h 2011-01-06 14:49:50.000000000 +0200 -@@ -0,0 +1,32 @@ +@@ -0,0 +1,40 @@ +/* + * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * University Research and Technology @@ -279,12 +279,20 @@ + +#define OPAL_HAVE_SYS_TIMER_GET_CYCLES 1 + ++#include ++ +typedef uint64_t opal_timer_t; + +static inline opal_timer_t +opal_sys_timer_get_cycles(void) +{ -+ return 0; ++ opal_timer_t ret; ++ struct tms accurate_clock; ++ ++ times(&accurate_clock); ++ ret = accurate_clock.tms_utime + accurate_clock.tms_stime; ++ ++ return ret; +} + +#endif /* ! OMPI_SYS_ARCH_TIMER_H */