From d0ac7bb577e9d2e2a02abc2b159a486884f0274a Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Sun, 9 Feb 2020 18:32:42 +0100 Subject: [PATCH] replace no-inline attributes There is a macro __rte_noinline, preventing function to be inlined, which is now used where appropriate for consistency. Signed-off-by: Thomas Monjalon --- drivers/common/dpaax/compat.h | 2 +- drivers/net/dpaa2/dpaa2_rxtx.c | 4 ++-- lib/librte_eal/include/rte_common.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/common/dpaax/compat.h b/drivers/common/dpaax/compat.h index 5b11c2d927..90db68ce76 100644 --- a/drivers/common/dpaax/compat.h +++ b/drivers/common/dpaax/compat.h @@ -60,7 +60,7 @@ #define __packed __rte_packed #endif #ifndef noinline -#define noinline __attribute__((noinline)) +#define noinline __rte_noinline #endif #define L1_CACHE_BYTES 64 #define ____cacheline_aligned __rte_aligned(L1_CACHE_BYTES) diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index 52d913d9ea..23d48035d5 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -363,7 +363,7 @@ eth_fd_to_mbuf(const struct qbman_fd *fd, return mbuf; } -static int __attribute__ ((noinline)) __attribute__((hot)) +static int __rte_noinline __attribute__((hot)) eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf, struct qbman_fd *fd, uint16_t bpid) { @@ -434,7 +434,7 @@ static void eth_mbuf_to_fd(struct rte_mbuf *mbuf, struct qbman_fd *fd, uint16_t bpid) __attribute__((unused)); -static void __attribute__ ((noinline)) __attribute__((hot)) +static void __rte_noinline __attribute__((hot)) eth_mbuf_to_fd(struct rte_mbuf *mbuf, struct qbman_fd *fd, uint16_t bpid) { diff --git a/lib/librte_eal/include/rte_common.h b/lib/librte_eal/include/rte_common.h index c945aeab78..db12e7c3c2 100644 --- a/lib/librte_eal/include/rte_common.h +++ b/lib/librte_eal/include/rte_common.h @@ -185,7 +185,7 @@ static void __attribute__((destructor(RTE_PRIO(prio)), used)) func(void) /** * Force a function to be noinlined */ -#define __rte_noinline __attribute__((noinline)) +#define __rte_noinline __attribute__((noinline)) /*********** Macros for pointer arithmetic ********/ -- 2.20.1