diff options
| author | Matias Elo <matias.elo@nokia.com> | 2021-10-11 16:37:51 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-11 16:37:51 +0300 |
| commit | 50c7b605b97474d26fcf600b4061968e3543b45b (patch) | |
| tree | bb5541aab05c99d762a054a9f1fe64cd002d7f86 /platform/linux-generic/arch/x86/odp | |
| parent | 54ca03915ddf070a3c67f6a3c89f442c202a1adb (diff) | |
| parent | ec77bf59d3407278625c28a8d47c3dab9627a91f (diff) | |
Merge ODP v1.32.0.0v1.32.0.0_DPDK_19.11
Merge ODP linux-generic v1.32.0.0 into ODP-DPDK.
Diffstat (limited to 'platform/linux-generic/arch/x86/odp')
| -rw-r--r-- | platform/linux-generic/arch/x86/odp/api/abi/cpu_inlines.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/platform/linux-generic/arch/x86/odp/api/abi/cpu_inlines.h b/platform/linux-generic/arch/x86/odp/api/abi/cpu_inlines.h index 1eb8a9561..4b542a577 100644 --- a/platform/linux-generic/arch/x86/odp/api/abi/cpu_inlines.h +++ b/platform/linux-generic/arch/x86/odp/api/abi/cpu_inlines.h @@ -1,4 +1,5 @@ /* Copyright (c) 2018, Linaro Limited + * Copyright (c) 2021, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -7,10 +8,14 @@ #ifndef ODP_ARCH_CPU_INLINES_H_ #define ODP_ARCH_CPU_INLINES_H_ +#ifdef __cplusplus +extern "C" { +#endif + #include <stdint.h> #include <odp/api/abi/cpu_rdtsc.h> -_ODP_INLINE void odp_cpu_pause(void) +static inline void _odp_cpu_pause(void) { #ifdef __SSE2__ __asm__ __volatile__ ("pause"); @@ -19,19 +24,23 @@ _ODP_INLINE void odp_cpu_pause(void) #endif } -_ODP_INLINE uint64_t odp_cpu_cycles(void) +static inline uint64_t _odp_cpu_cycles(void) { return _odp_cpu_rdtsc(); } -_ODP_INLINE uint64_t odp_cpu_cycles_max(void) +static inline uint64_t _odp_cpu_cycles_max(void) { return UINT64_MAX; } -_ODP_INLINE uint64_t odp_cpu_cycles_resolution(void) +static inline uint64_t _odp_cpu_cycles_resolution(void) { return 1; } +#ifdef __cplusplus +} +#endif + #endif |