From 27fefbc8246aed886b91a2e557d3ac88d5a3b98c Mon Sep 17 00:00:00 2001
From: Matias Elo <matias.elo@nokia.com>
Date: Mon, 7 Feb 2022 17:00:44 +0200
Subject: Port 98e75e983 "linux-gen: shm: stop listing deprecated
 ODP_SHM_SW_ONLY flag as supported"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Port original commit from linux-generic.

Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Jere Leppänen <jere.leppanen@nokia.com>
---
 platform/linux-dpdk/odp_shared_memory.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'platform')

diff --git a/platform/linux-dpdk/odp_shared_memory.c b/platform/linux-dpdk/odp_shared_memory.c
index c18c9acca..f3a217341 100644
--- a/platform/linux-dpdk/odp_shared_memory.c
+++ b/platform/linux-dpdk/odp_shared_memory.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2017-2018, Linaro Limited
- * Copyright (c) 2021, Nokia
+ * Copyright (c) 2021-2022, Nokia
  * All rights reserved.
  *
  * SPDX-License-Identifier:     BSD-3-Clause
@@ -8,6 +8,7 @@
 #include <odp_posix_extensions.h>
 
 #include <odp/api/debug.h>
+#include <odp/api/deprecated.h>
 #include <odp/api/plat/strong_types.h>
 #include <odp/api/shared_memory.h>
 #include <odp/api/spinlock.h>
@@ -28,7 +29,13 @@
 #include <rte_memzone.h>
 
 /* Supported ODP_SHM_* flags */
-#define SUPPORTED_SHM_FLAGS (ODP_SHM_SW_ONLY | ODP_SHM_EXPORT | ODP_SHM_HP)
+#if ODP_DEPRECATED_API
+	#define DEPRECATED_SHM_FLAGS (ODP_SHM_SW_ONLY)
+#else
+	#define DEPRECATED_SHM_FLAGS 0
+#endif
+
+#define SUPPORTED_SHM_FLAGS (ODP_SHM_EXPORT | ODP_SHM_HP | DEPRECATED_SHM_FLAGS)
 
 #define SHM_MAX_ALIGN (0x80000000)
 #define SHM_BLOCK_NAME "%" PRIu64 "-%d-%s"
-- 
cgit v1.2.3