Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/112553/?format=api
{ "id": 112553, "url": "http://patches.dpdk.org/api/patches/112553/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20220608115701.2037384-1-david.marchand@redhat.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20220608115701.2037384-1-david.marchand@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220608115701.2037384-1-david.marchand@redhat.com", "date": "2022-06-08T11:57:01", "name": "[v2] eal: remove unused arch specific headers for locks", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "1e5d7ff90c1fd073936eaf2240dfe604b40d78ab", "submitter": { "id": 1173, "url": "http://patches.dpdk.org/api/people/1173/?format=api", "name": "David Marchand", "email": "david.marchand@redhat.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20220608115701.2037384-1-david.marchand@redhat.com/mbox/", "series": [ { "id": 23415, "url": "http://patches.dpdk.org/api/series/23415/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=23415", "date": "2022-06-08T11:57:01", "name": "[v2] eal: remove unused arch specific headers for locks", "version": 2, "mbox": "http://patches.dpdk.org/series/23415/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/112553/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/112553/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 15AD3A04FD;\n\tWed, 8 Jun 2022 13:57:30 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id EEB1240689;\n\tWed, 8 Jun 2022 13:57:29 +0200 (CEST)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.133.124])\n by mails.dpdk.org (Postfix) with ESMTP id 5C5B84021D\n for <dev@dpdk.org>; Wed, 8 Jun 2022 13:57:28 +0200 (CEST)", "from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com\n [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n us-mta-636-WSn3O3LLNDKpbliXaG3wMA-1; Wed, 08 Jun 2022 07:57:22 -0400", "from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com\n [10.11.54.2])\n (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n (No client certificate requested)\n by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 676981C1826C;\n Wed, 8 Jun 2022 11:57:21 +0000 (UTC)", "from localhost.localdomain (unknown [10.40.193.24])\n by smtp.corp.redhat.com (Postfix) with ESMTP id EE36240D2827;\n Wed, 8 Jun 2022 11:57:18 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1654689446;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=SkSf0BXKO81pUdOVXlsn8deAk3WnoXFOankkYhu5O/Y=;\n b=Eop4WIaFY2y38bXgFdeVoje8N9F0l9N6NjiRQLJkOtb+O4hnVqOFjyQI19FF3BAZMed8Up\n mq7wVdUIEXlYTxvlZTLqXJ/0jo2t0CdKXWmaQ64M/CjlSyGLDw5omXi6C77KgZ9vnPpQaR\n rWysVaWW2eMqyZUo8XUeowGCLBWtxtU=", "X-MC-Unique": "WSn3O3LLNDKpbliXaG3wMA-1", "From": "David Marchand <david.marchand@redhat.com>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>,\n Thomas Monjalon <thomas@monjalon.net>, Ruifeng Wang <ruifeng.wang@arm.com>,\n Jan Viktorin <viktorin@rehivetech.com>,\n Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>,\n Joyce Kong <joyce.kong@arm.com>,\n David Christensen <drc@linux.vnet.ibm.com>,\n Stanislaw Kardach <kda@semihalf.com>,\n Bruce Richardson <bruce.richardson@intel.com>,\n Konstantin Ananyev <konstantin.v.ananyev@yandex.ru>", "Subject": "[PATCH v2] eal: remove unused arch specific headers for locks", "Date": "Wed, 8 Jun 2022 13:57:01 +0200", "Message-Id": "<20220608115701.2037384-1-david.marchand@redhat.com>", "In-Reply-To": "<20220607190308.1926702-1-david.marchand@redhat.com>", "References": "<20220607190308.1926702-1-david.marchand@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 2.84 on 10.11.54.2", "Authentication-Results": "relay.mimecast.com;\n auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david.marchand@redhat.com", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"; x-default=true", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "MCS lock, PF lock and Ticket lock have no arch specific implementation,\nthere is no need for the extra redirection in headers.\n\nSigned-off-by: David Marchand <david.marchand@redhat.com>\nAcked-by: Stephen Hemminger <stephen@networkplumber.org>\n---\nNote: this was mentionned during the seqlock patch review, and I spotted\nit again, while reviewing the RISC-V port, and I see the same for a next\narchitecture too. So better clean this up as we don't need the\nredirection.\n\nChanges since v1:\n- rebased following RISC-V merge,\n\n---\n MAINTAINERS | 4 ++--\n lib/eal/arm/include/meson.build | 3 ---\n lib/eal/arm/include/rte_mcslock.h | 22 -------------------\n lib/eal/arm/include/rte_pflock.h | 18 ---------------\n lib/eal/arm/include/rte_ticketlock.h | 22 -------------------\n lib/eal/include/meson.build | 6 ++---\n lib/eal/include/{generic => }/rte_mcslock.h | 8 +++++++\n lib/eal/include/{generic => }/rte_pflock.h | 0\n .../include/{generic => }/rte_ticketlock.h | 0\n lib/eal/ppc/include/meson.build | 3 ---\n lib/eal/ppc/include/rte_mcslock.h | 18 ---------------\n lib/eal/ppc/include/rte_pflock.h | 17 --------------\n lib/eal/ppc/include/rte_ticketlock.h | 18 ---------------\n lib/eal/riscv/include/meson.build | 3 ---\n lib/eal/riscv/include/rte_mcslock.h | 18 ---------------\n lib/eal/riscv/include/rte_pflock.h | 17 --------------\n lib/eal/riscv/include/rte_ticketlock.h | 21 ------------------\n lib/eal/x86/include/meson.build | 3 ---\n lib/eal/x86/include/rte_mcslock.h | 18 ---------------\n lib/eal/x86/include/rte_pflock.h | 18 ---------------\n lib/eal/x86/include/rte_ticketlock.h | 18 ---------------\n 21 files changed, 13 insertions(+), 242 deletions(-)\n delete mode 100644 lib/eal/arm/include/rte_mcslock.h\n delete mode 100644 lib/eal/arm/include/rte_pflock.h\n delete mode 100644 lib/eal/arm/include/rte_ticketlock.h\n rename lib/eal/include/{generic => }/rte_mcslock.h (98%)\n rename lib/eal/include/{generic => }/rte_pflock.h (100%)\n rename lib/eal/include/{generic => }/rte_ticketlock.h (100%)\n delete mode 100644 lib/eal/ppc/include/rte_mcslock.h\n delete mode 100644 lib/eal/ppc/include/rte_pflock.h\n delete mode 100644 lib/eal/ppc/include/rte_ticketlock.h\n delete mode 100644 lib/eal/riscv/include/rte_mcslock.h\n delete mode 100644 lib/eal/riscv/include/rte_pflock.h\n delete mode 100644 lib/eal/riscv/include/rte_ticketlock.h\n delete mode 100644 lib/eal/x86/include/rte_mcslock.h\n delete mode 100644 lib/eal/x86/include/rte_pflock.h\n delete mode 100644 lib/eal/x86/include/rte_ticketlock.h", "diff": "diff --git a/MAINTAINERS b/MAINTAINERS\nindex 372f44523d..4e477401f8 100644\n--- a/MAINTAINERS\n+++ b/MAINTAINERS\n@@ -255,7 +255,7 @@ F: app/test/test_bitmap.c\n \n MCSlock\n M: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>\n-F: lib/eal/include/generic/rte_mcslock.h\n+F: lib/eal/include/rte_mcslock.h\n F: app/test/test_mcslock.c\n \n Sequence Lock\n@@ -266,7 +266,7 @@ F: app/test/test_seqlock.c\n \n Ticketlock\n M: Joyce Kong <joyce.kong@arm.com>\n-F: lib/eal/include/generic/rte_ticketlock.h\n+F: lib/eal/include/rte_ticketlock.h\n F: app/test/test_ticketlock.c\n \n Pseudo-random Number Generation\ndiff --git a/lib/eal/arm/include/meson.build b/lib/eal/arm/include/meson.build\nindex 65c3aec35c..657bf58569 100644\n--- a/lib/eal/arm/include/meson.build\n+++ b/lib/eal/arm/include/meson.build\n@@ -14,21 +14,18 @@ arch_headers = files(\n 'rte_cycles.h',\n 'rte_io_64.h',\n 'rte_io.h',\n- 'rte_mcslock.h',\n 'rte_memcpy_32.h',\n 'rte_memcpy_64.h',\n 'rte_memcpy.h',\n 'rte_pause_32.h',\n 'rte_pause_64.h',\n 'rte_pause.h',\n- 'rte_pflock.h',\n 'rte_power_intrinsics.h',\n 'rte_prefetch_32.h',\n 'rte_prefetch_64.h',\n 'rte_prefetch.h',\n 'rte_rwlock.h',\n 'rte_spinlock.h',\n- 'rte_ticketlock.h',\n 'rte_vect.h',\n )\n install_headers(arch_headers, subdir: get_option('include_subdir_arch'))\ndiff --git a/lib/eal/arm/include/rte_mcslock.h b/lib/eal/arm/include/rte_mcslock.h\ndeleted file mode 100644\nindex 896d678073..0000000000\n--- a/lib/eal/arm/include/rte_mcslock.h\n+++ /dev/null\n@@ -1,22 +0,0 @@\n-/* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright(c) 2019 Arm Limited\n- */\n-\n-#ifndef _RTE_MCSLOCK_ARM_H_\n-#define _RTE_MCSLOCK_ARM_H_\n-\n-#ifndef RTE_FORCE_INTRINSICS\n-# error Platform must be built with RTE_FORCE_INTRINSICS\n-#endif\n-\n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n-#include \"generic/rte_mcslock.h\"\n-\n-#ifdef __cplusplus\n-}\n-#endif\n-\n-#endif /* _RTE_MCSLOCK_ARM_H_ */\ndiff --git a/lib/eal/arm/include/rte_pflock.h b/lib/eal/arm/include/rte_pflock.h\ndeleted file mode 100644\nindex bb9934eec4..0000000000\n--- a/lib/eal/arm/include/rte_pflock.h\n+++ /dev/null\n@@ -1,18 +0,0 @@\n-/* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright(c) 2021 Microsoft Corporation\n- */\n-\n-#ifndef _RTE_PFLOCK_ARM_H_\n-#define _RTE_PFLOCK_ARM_H_\n-\n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n-#include \"generic/rte_pflock.h\"\n-\n-#ifdef __cplusplus\n-}\n-#endif\n-\n-#endif /* _RTE_PFLOCK_ARM_H_ */\ndiff --git a/lib/eal/arm/include/rte_ticketlock.h b/lib/eal/arm/include/rte_ticketlock.h\ndeleted file mode 100644\nindex e66beefbe2..0000000000\n--- a/lib/eal/arm/include/rte_ticketlock.h\n+++ /dev/null\n@@ -1,22 +0,0 @@\n-/* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright(c) 2019 Arm Limited\n- */\n-\n-#ifndef _RTE_TICKETLOCK_ARM_H_\n-#define _RTE_TICKETLOCK_ARM_H_\n-\n-#ifndef RTE_FORCE_INTRINSICS\n-# error Platform must be built with RTE_FORCE_INTRINSICS\n-#endif\n-\n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n-#include \"generic/rte_ticketlock.h\"\n-\n-#ifdef __cplusplus\n-}\n-#endif\n-\n-#endif /* _RTE_TICKETLOCK_ARM_H_ */\ndiff --git a/lib/eal/include/meson.build b/lib/eal/include/meson.build\nindex 40ebb5b63d..fd6e844224 100644\n--- a/lib/eal/include/meson.build\n+++ b/lib/eal/include/meson.build\n@@ -29,11 +29,13 @@ headers += files(\n 'rte_lcore.h',\n 'rte_log.h',\n 'rte_malloc.h',\n+ 'rte_mcslock.h',\n 'rte_memory.h',\n 'rte_memzone.h',\n 'rte_pci_dev_feature_defs.h',\n 'rte_pci_dev_features.h',\n 'rte_per_lcore.h',\n+ 'rte_pflock.h',\n 'rte_random.h',\n 'rte_reciprocal.h',\n 'rte_seqcount.h',\n@@ -43,6 +45,7 @@ headers += files(\n 'rte_string_fns.h',\n 'rte_tailq.h',\n 'rte_thread.h',\n+ 'rte_ticketlock.h',\n 'rte_time.h',\n 'rte_trace.h',\n 'rte_trace_point.h',\n@@ -59,15 +62,12 @@ generic_headers = files(\n 'generic/rte_cpuflags.h',\n 'generic/rte_cycles.h',\n 'generic/rte_io.h',\n- 'generic/rte_mcslock.h',\n 'generic/rte_memcpy.h',\n 'generic/rte_pause.h',\n- 'generic/rte_pflock.h',\n 'generic/rte_power_intrinsics.h',\n 'generic/rte_prefetch.h',\n 'generic/rte_rwlock.h',\n 'generic/rte_spinlock.h',\n- 'generic/rte_ticketlock.h',\n 'generic/rte_vect.h',\n )\n install_headers(generic_headers, subdir: 'generic')\ndiff --git a/lib/eal/include/generic/rte_mcslock.h b/lib/eal/include/rte_mcslock.h\nsimilarity index 98%\nrename from lib/eal/include/generic/rte_mcslock.h\nrename to lib/eal/include/rte_mcslock.h\nindex f15b785358..a805cb2906 100644\n--- a/lib/eal/include/generic/rte_mcslock.h\n+++ b/lib/eal/include/rte_mcslock.h\n@@ -19,6 +19,10 @@\n * they acquired the lock.\n */\n \n+#ifdef __cplusplus\n+extern \"C\" {\n+#endif\n+\n #include <rte_lcore.h>\n #include <rte_common.h>\n #include <rte_pause.h>\n@@ -169,4 +173,8 @@ rte_mcslock_is_locked(rte_mcslock_t *msl)\n \treturn (__atomic_load_n(&msl, __ATOMIC_RELAXED) != NULL);\n }\n \n+#ifdef __cplusplus\n+}\n+#endif\n+\n #endif /* _RTE_MCSLOCK_H_ */\ndiff --git a/lib/eal/include/generic/rte_pflock.h b/lib/eal/include/rte_pflock.h\nsimilarity index 100%\nrename from lib/eal/include/generic/rte_pflock.h\nrename to lib/eal/include/rte_pflock.h\ndiff --git a/lib/eal/include/generic/rte_ticketlock.h b/lib/eal/include/rte_ticketlock.h\nsimilarity index 100%\nrename from lib/eal/include/generic/rte_ticketlock.h\nrename to lib/eal/include/rte_ticketlock.h\ndiff --git a/lib/eal/ppc/include/meson.build b/lib/eal/ppc/include/meson.build\nindex 1e1f39c05a..fa64330f01 100644\n--- a/lib/eal/ppc/include/meson.build\n+++ b/lib/eal/ppc/include/meson.build\n@@ -8,15 +8,12 @@ arch_headers = files(\n 'rte_cpuflags.h',\n 'rte_cycles.h',\n 'rte_io.h',\n- 'rte_mcslock.h',\n 'rte_memcpy.h',\n 'rte_pause.h',\n- 'rte_pflock.h',\n 'rte_power_intrinsics.h',\n 'rte_prefetch.h',\n 'rte_rwlock.h',\n 'rte_spinlock.h',\n- 'rte_ticketlock.h',\n 'rte_vect.h',\n )\n install_headers(arch_headers, subdir: get_option('include_subdir_arch'))\ndiff --git a/lib/eal/ppc/include/rte_mcslock.h b/lib/eal/ppc/include/rte_mcslock.h\ndeleted file mode 100644\nindex c58a6edc1c..0000000000\n--- a/lib/eal/ppc/include/rte_mcslock.h\n+++ /dev/null\n@@ -1,18 +0,0 @@\n-/* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright(c) 2019 Arm Limited\n- */\n-\n-#ifndef _RTE_MCSLOCK_PPC_64_H_\n-#define _RTE_MCSLOCK_PPC_64_H_\n-\n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n-#include \"generic/rte_mcslock.h\"\n-\n-#ifdef __cplusplus\n-}\n-#endif\n-\n-#endif /* _RTE_MCSLOCK_PPC_64_H_ */\ndiff --git a/lib/eal/ppc/include/rte_pflock.h b/lib/eal/ppc/include/rte_pflock.h\ndeleted file mode 100644\nindex 27c201b11d..0000000000\n--- a/lib/eal/ppc/include/rte_pflock.h\n+++ /dev/null\n@@ -1,17 +0,0 @@\n-/* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright(c) 2021 Microsoft Corporation\n- */\n-#ifndef _RTE_PFLOCK_PPC_64_H_\n-#define _RTE_PFLOCK_PPC_64_H_\n-\n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n-#include \"generic/rte_pflock.h\"\n-\n-#ifdef __cplusplus\n-}\n-#endif\n-\n-#endif /* _RTE_PFLOCK_PPC_64_H_ */\ndiff --git a/lib/eal/ppc/include/rte_ticketlock.h b/lib/eal/ppc/include/rte_ticketlock.h\ndeleted file mode 100644\nindex c175e9eab2..0000000000\n--- a/lib/eal/ppc/include/rte_ticketlock.h\n+++ /dev/null\n@@ -1,18 +0,0 @@\n-/* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright(c) 2019 Arm Limited\n- */\n-\n-#ifndef _RTE_TICKETLOCK_PPC_64_H_\n-#define _RTE_TICKETLOCK_PPC_64_H_\n-\n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n-#include \"generic/rte_ticketlock.h\"\n-\n-#ifdef __cplusplus\n-}\n-#endif\n-\n-#endif /* _RTE_TICKETLOCK_PPC_64_H_ */\ndiff --git a/lib/eal/riscv/include/meson.build b/lib/eal/riscv/include/meson.build\nindex 7f6e4a5b1e..481c7d50a4 100644\n--- a/lib/eal/riscv/include/meson.build\n+++ b/lib/eal/riscv/include/meson.build\n@@ -9,15 +9,12 @@ arch_headers = files(\n 'rte_cpuflags.h',\n 'rte_cycles.h',\n 'rte_io.h',\n- 'rte_mcslock.h',\n 'rte_memcpy.h',\n 'rte_pause.h',\n- 'rte_pflock.h',\n 'rte_power_intrinsics.h',\n 'rte_prefetch.h',\n 'rte_rwlock.h',\n 'rte_spinlock.h',\n- 'rte_ticketlock.h',\n 'rte_vect.h',\n )\n install_headers(arch_headers, subdir: get_option('include_subdir_arch'))\ndiff --git a/lib/eal/riscv/include/rte_mcslock.h b/lib/eal/riscv/include/rte_mcslock.h\ndeleted file mode 100644\nindex b517cd5fc5..0000000000\n--- a/lib/eal/riscv/include/rte_mcslock.h\n+++ /dev/null\n@@ -1,18 +0,0 @@\n-/* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright(c) 2019 Arm Limited\n- */\n-\n-#ifndef RTE_MCSLOCK_RISCV_H\n-#define RTE_MCSLOCK_RISCV_H\n-\n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n-#include \"generic/rte_mcslock.h\"\n-\n-#ifdef __cplusplus\n-}\n-#endif\n-\n-#endif /* RTE_MCSLOCK_RISCV_H */\ndiff --git a/lib/eal/riscv/include/rte_pflock.h b/lib/eal/riscv/include/rte_pflock.h\ndeleted file mode 100644\nindex ce6ca02aca..0000000000\n--- a/lib/eal/riscv/include/rte_pflock.h\n+++ /dev/null\n@@ -1,17 +0,0 @@\n-/* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright(c) 2021 Microsoft Corporation\n- */\n-#ifndef RTE_PFLOCK_RISCV_H\n-#define RTE_PFLOCK_RISCV_H\n-\n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n-#include \"generic/rte_pflock.h\"\n-\n-#ifdef __cplusplus\n-}\n-#endif\n-\n-#endif /* RTE_PFLOCK_RISCV_H */\ndiff --git a/lib/eal/riscv/include/rte_ticketlock.h b/lib/eal/riscv/include/rte_ticketlock.h\ndeleted file mode 100644\nindex b8d2a4f937..0000000000\n--- a/lib/eal/riscv/include/rte_ticketlock.h\n+++ /dev/null\n@@ -1,21 +0,0 @@\n-/* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright(c) 2019 Arm Limited\n- * Copyright(c) 2022 StarFive\n- * Copyright(c) 2022 SiFive\n- * Copyright(c) 2022 Semihalf\n- */\n-\n-#ifndef RTE_TICKETLOCK_RISCV_H\n-#define RTE_TICKETLOCK_RISCV_H\n-\n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n-#include \"generic/rte_ticketlock.h\"\n-\n-#ifdef __cplusplus\n-}\n-#endif\n-\n-#endif /* RTE_TICKETLOCK_RISCV_H */\ndiff --git a/lib/eal/x86/include/meson.build b/lib/eal/x86/include/meson.build\nindex 12c2e00035..52d2f8e969 100644\n--- a/lib/eal/x86/include/meson.build\n+++ b/lib/eal/x86/include/meson.build\n@@ -7,16 +7,13 @@ arch_headers = files(\n 'rte_cpuflags.h',\n 'rte_cycles.h',\n 'rte_io.h',\n- 'rte_mcslock.h',\n 'rte_memcpy.h',\n 'rte_pause.h',\n- 'rte_pflock.h',\n 'rte_power_intrinsics.h',\n 'rte_prefetch.h',\n 'rte_rtm.h',\n 'rte_rwlock.h',\n 'rte_spinlock.h',\n- 'rte_ticketlock.h',\n 'rte_vect.h',\n )\n arch_indirect_headers = files(\ndiff --git a/lib/eal/x86/include/rte_mcslock.h b/lib/eal/x86/include/rte_mcslock.h\ndeleted file mode 100644\nindex a8f041a720..0000000000\n--- a/lib/eal/x86/include/rte_mcslock.h\n+++ /dev/null\n@@ -1,18 +0,0 @@\n-/* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright(c) 2019 Arm Limited\n- */\n-\n-#ifndef _RTE_MCSLOCK_X86_64_H_\n-#define _RTE_MCSLOCK_X86_64_H_\n-\n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n-#include \"generic/rte_mcslock.h\"\n-\n-#ifdef __cplusplus\n-}\n-#endif\n-\n-#endif /* _RTE_MCSLOCK_X86_64_H_ */\ndiff --git a/lib/eal/x86/include/rte_pflock.h b/lib/eal/x86/include/rte_pflock.h\ndeleted file mode 100644\nindex c2d876062c..0000000000\n--- a/lib/eal/x86/include/rte_pflock.h\n+++ /dev/null\n@@ -1,18 +0,0 @@\n-/* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright(c) 2021 Microsoft Corporation\n- */\n-\n-#ifndef _RTE_PFLOCK_X86_64_H_\n-#define _RTE_PFLOCK_X86_64_H_\n-\n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n-#include \"generic/rte_pflock.h\"\n-\n-#ifdef __cplusplus\n-}\n-#endif\n-\n-#endif /* _RTE_PFLOCK_X86_64_H_ */\ndiff --git a/lib/eal/x86/include/rte_ticketlock.h b/lib/eal/x86/include/rte_ticketlock.h\ndeleted file mode 100644\nindex 0cc01f6b92..0000000000\n--- a/lib/eal/x86/include/rte_ticketlock.h\n+++ /dev/null\n@@ -1,18 +0,0 @@\n-/* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright(c) 2019 Arm Limited\n- */\n-\n-#ifndef _RTE_TICKETLOCK_X86_64_H_\n-#define _RTE_TICKETLOCK_X86_64_H_\n-\n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n-#include \"generic/rte_ticketlock.h\"\n-\n-#ifdef __cplusplus\n-}\n-#endif\n-\n-#endif /* _RTE_TICKETLOCK_X86_64_H_ */\n", "prefixes": [ "v2" ] }