Skip to content

Commit f2c108b

Browse files
committed
opal/sys: Correct OPAL_HAVE_SYS_TIMER_GET_CYCLES value
... in the case of `OPAL_GCC_INLINE_ASSEMBLY == 0` In this case, `OPAL_HAVE_SYS_TIMER_GET_CYCLES` should be 0 because the `opal_sys_timer_get_cycles` function is not defined. The history: 1. Before 8d4175a, `OPAL_HAVE_SYS_TIMER_GET_CYCLES` was 0. 2. In 8d4175a, adf92d6, adf92d6, and c62ce15, `OPAL_HAVE_SYS_TIMER_GET_CYCLES` was changed to 1 by introducing `opal/asm/base/*.asm`. 3. In ebce88b, `opal/asm/base/*.asm` were removed. Signed-off-by: KAWASHIMA Takahiro <t-kawashima@jp.fujitsu.com>
1 parent 98fdeee commit f2c108b

File tree

4 files changed

+3
-11
lines changed

4 files changed

+3
-11
lines changed

opal/include/opal/sys/arm64/timer.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
#ifndef OPAL_SYS_ARCH_TIMER_H
1717
#define OPAL_SYS_ARCH_TIMER_H 1
1818

19-
#include <sys/times.h>
20-
2119
typedef uint64_t opal_timer_t;
2220

2321
static inline opal_timer_t

opal/include/opal/sys/ia32/timer.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@ opal_sys_timer_get_cycles(void)
4949

5050
#else
5151

52-
opal_timer_t opal_sys_timer_get_cycles(void);
53-
54-
#define OPAL_HAVE_SYS_TIMER_GET_CYCLES 1
52+
#define OPAL_HAVE_SYS_TIMER_GET_CYCLES 0
5553

5654
#endif /* OPAL_GCC_INLINE_ASSEMBLY */
5755

opal/include/opal/sys/powerpc/timer.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@ opal_sys_timer_get_cycles(void)
4343

4444
#else
4545

46-
opal_timer_t opal_sys_timer_get_cycles(void);
47-
48-
#define OPAL_HAVE_SYS_TIMER_GET_CYCLES 1
46+
#define OPAL_HAVE_SYS_TIMER_GET_CYCLES 0
4947

5048
#endif /* OPAL_GCC_INLINE_ASSEMBLY */
5149

opal/include/opal/sys/x86_64/timer.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@ static inline bool opal_sys_timer_is_monotonic (void)
6565

6666
#else
6767

68-
opal_timer_t opal_sys_timer_get_cycles(void);
69-
70-
#define OPAL_HAVE_SYS_TIMER_GET_CYCLES 1
68+
#define OPAL_HAVE_SYS_TIMER_GET_CYCLES 0
7169

7270
#endif /* OPAL_GCC_INLINE_ASSEMBLY */
7371

0 commit comments

Comments
 (0)