Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 1347,
    "url": "https://patches.dpdk.org/api/patches/1347/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/1416399968-348-2-git-send-email-sergio.gonzalez.monroy@intel.com/",
    "project": {
        "id": 1,
        "url": "https://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": "<1416399968-348-2-git-send-email-sergio.gonzalez.monroy@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1416399968-348-2-git-send-email-sergio.gonzalez.monroy@intel.com",
    "date": "2014-11-19T12:26:06",
    "name": "[dpdk-dev,1/3] Add RTE_ prefix to CACHE_LINE_SIZE macro",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": true,
    "hash": "4c1f7f9e81887dfcb688787cfe531db272013aaa",
    "submitter": {
        "id": 73,
        "url": "https://patches.dpdk.org/api/people/73/?format=api",
        "name": "Sergio Gonzalez Monroy",
        "email": "sergio.gonzalez.monroy@intel.com"
    },
    "delegate": null,
    "mbox": "https://patches.dpdk.org/project/dpdk/patch/1416399968-348-2-git-send-email-sergio.gonzalez.monroy@intel.com/mbox/",
    "series": [],
    "comments": "https://patches.dpdk.org/api/patches/1347/comments/",
    "check": "pending",
    "checks": "https://patches.dpdk.org/api/patches/1347/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@dpdk.org",
        "Delivered-To": "patchwork@dpdk.org",
        "Received": [
            "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id B03837F00;\n\tWed, 19 Nov 2014 13:15:58 +0100 (CET)",
            "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby dpdk.org (Postfix) with ESMTP id DC5F37E18\n\tfor <dev@dpdk.org>; Wed, 19 Nov 2014 13:15:47 +0100 (CET)",
            "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby fmsmga102.fm.intel.com with ESMTP; 19 Nov 2014 04:26:13 -0800",
            "from irvmail001.ir.intel.com ([163.33.26.43])\n\tby fmsmga002.fm.intel.com with ESMTP; 19 Nov 2014 04:26:09 -0800",
            "from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com\n\t[10.237.217.46])\n\tby irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id\n\tsAJCQ8Om008250 for <dev@dpdk.org>; Wed, 19 Nov 2014 12:26:08 GMT",
            "from sivswdev02.ir.intel.com (localhost [127.0.0.1])\n\tby sivswdev02.ir.intel.com with ESMTP id sAJCQ84B000393\n\tfor <dev@dpdk.org>; Wed, 19 Nov 2014 12:26:08 GMT",
            "(from smonroy@localhost)\n\tby sivswdev02.ir.intel.com with  id sAJCQ8iP000389\n\tfor dev@dpdk.org; Wed, 19 Nov 2014 12:26:08 GMT"
        ],
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.07,416,1413270000\"; d=\"scan'208\";a=\"634469754\"",
        "From": "Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>",
        "To": "dev@dpdk.org",
        "Date": "Wed, 19 Nov 2014 12:26:06 +0000",
        "Message-Id": "<1416399968-348-2-git-send-email-sergio.gonzalez.monroy@intel.com>",
        "X-Mailer": "git-send-email 1.8.5.4",
        "In-Reply-To": "<1416399968-348-1-git-send-email-sergio.gonzalez.monroy@intel.com>",
        "References": "<1416399968-348-1-git-send-email-sergio.gonzalez.monroy@intel.com>",
        "Subject": "[dpdk-dev] [PATCH 1/3] Add RTE_ prefix to CACHE_LINE_SIZE macro",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "patches and discussions about DPDK <dev.dpdk.org>",
        "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://dpdk.org/ml/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "CACHE_LINE_SIZE is a macro defined in machine/param.h in FreeBSD and\nconflicts with DPDK macro version.\n\nAdding RTE_ prefix to avoid conflicts.\n\nSigned-off-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>\n---\n app/test-acl/main.c                               |  2 +-\n app/test-pipeline/runtime.c                       |  2 +-\n app/test-pmd/testpmd.c                            | 12 +++----\n app/test-pmd/testpmd.h                            |  4 +--\n app/test/test_distributor_perf.c                  |  2 +-\n app/test/test_ivshmem.c                           |  6 ++--\n app/test/test_malloc.c                            | 32 ++++++++---------\n app/test/test_mbuf.c                              |  2 +-\n app/test/test_memzone.c                           | 26 +++++++-------\n app/test/test_pmd_perf.c                          |  4 +--\n app/test/test_table.h                             |  2 +-\n doc/guides/sample_app_ug/kernel_nic_interface.rst |  2 +-\n examples/dpdk_qat/crypto.c                        |  2 +-\n examples/ip_pipeline/cmdline.c                    |  8 ++---\n examples/ip_pipeline/init.c                       |  4 +--\n examples/ip_pipeline/pipeline_passthrough.c       |  2 +-\n examples/ip_pipeline/pipeline_rx.c                |  2 +-\n examples/ip_pipeline/pipeline_tx.c                |  2 +-\n examples/ip_reassembly/main.c                     |  2 +-\n examples/kni/main.c                               |  2 +-\n examples/multi_process/l2fwd_fork/flib.c          |  4 +--\n examples/multi_process/symmetric_mp/main.c        |  2 +-\n examples/netmap_compat/lib/compat_netmap.c        |  4 +--\n examples/qos_sched/main.c                         |  4 +--\n examples/vhost/main.c                             |  6 ++--\n examples/vhost_xen/vhost_monitor.c                |  4 +--\n lib/librte_acl/acl_gen.c                          |  6 ++--\n lib/librte_acl/rte_acl.c                          |  2 +-\n lib/librte_acl/rte_acl_osdep_alone.h              |  6 ++--\n lib/librte_distributor/rte_distributor.c          |  2 +-\n lib/librte_eal/common/eal_common_memzone.c        | 12 +++----\n lib/librte_eal/common/include/rte_memory.h        | 10 +++---\n lib/librte_ether/rte_ethdev.c                     | 10 +++---\n lib/librte_hash/rte_hash.c                        | 10 +++---\n lib/librte_ip_frag/rte_ip_frag_common.c           |  2 +-\n lib/librte_lpm/rte_lpm.c                          |  4 +--\n lib/librte_lpm/rte_lpm6.c                         |  4 +--\n lib/librte_malloc/malloc_elem.c                   |  4 +--\n lib/librte_malloc/malloc_elem.h                   |  2 +-\n lib/librte_malloc/malloc_heap.c                   |  2 +-\n lib/librte_mempool/rte_mempool.c                  |  8 ++---\n lib/librte_mempool/rte_mempool.h                  |  2 +-\n lib/librte_pipeline/rte_pipeline.c                |  4 +--\n lib/librte_pmd_e1000/em_rxtx.c                    | 10 +++---\n lib/librte_pmd_e1000/igb_rxtx.c                   |  8 ++---\n lib/librte_pmd_i40e/i40e_rxtx.c                   |  8 ++---\n lib/librte_pmd_ixgbe/ixgbe_rxtx.c                 |  8 ++---\n lib/librte_pmd_virtio/virtio_ethdev.c             | 10 +++---\n lib/librte_pmd_virtio/virtio_rxtx.c               |  2 +-\n lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c           |  2 +-\n lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c             |  8 ++---\n lib/librte_pmd_xenvirt/rte_eth_xenvirt.c          |  6 ++--\n lib/librte_port/rte_port_ethdev.c                 |  4 +--\n lib/librte_port/rte_port_frag.c                   |  2 +-\n lib/librte_port/rte_port_ras.c                    |  2 +-\n lib/librte_port/rte_port_ring.c                   |  4 +--\n lib/librte_port/rte_port_sched.c                  |  4 +--\n lib/librte_port/rte_port_source_sink.c            |  2 +-\n lib/librte_ring/rte_ring.c                        |  2 +-\n lib/librte_sched/rte_bitmap.h                     |  6 ++--\n lib/librte_sched/rte_sched.c                      |  2 +-\n lib/librte_table/rte_table_acl.c                  |  4 +--\n lib/librte_table/rte_table_array.c                |  8 ++---\n lib/librte_table/rte_table_hash_ext.c             |  6 ++--\n lib/librte_table/rte_table_hash_key16.c           | 36 +++++++++----------\n lib/librte_table/rte_table_hash_key32.c           | 44 +++++++++++------------\n lib/librte_table/rte_table_hash_key8.c            | 28 +++++++--------\n lib/librte_table/rte_table_hash_lru.c             |  6 ++--\n lib/librte_table/rte_table_lpm.c                  |  2 +-\n lib/librte_table/rte_table_lpm_ipv6.c             |  2 +-\n 70 files changed, 230 insertions(+), 230 deletions(-)",
    "diff": "diff --git a/app/test-acl/main.c b/app/test-acl/main.c\nindex 44add10..a2c127f 100644\n--- a/app/test-acl/main.c\n+++ b/app/test-acl/main.c\n@@ -470,7 +470,7 @@ tracef_init(void)\n \tstruct ipv6_5tuple *w;\n \n \tsz = config.nb_traces * (config.ipv6 ? sizeof(*w) : sizeof(*v));\n-\tconfig.traces = rte_zmalloc_socket(name, sz, CACHE_LINE_SIZE,\n+\tconfig.traces = rte_zmalloc_socket(name, sz, RTE_CACHE_LINE_SIZE,\n \t\t\tSOCKET_ID_ANY);\n \tif (config.traces == NULL)\n \t\trte_exit(EXIT_FAILURE, \"Cannot allocate %zu bytes for \"\ndiff --git a/app/test-pipeline/runtime.c b/app/test-pipeline/runtime.c\nindex 14b7998..1f1ea5f 100644\n--- a/app/test-pipeline/runtime.c\n+++ b/app/test-pipeline/runtime.c\n@@ -112,7 +112,7 @@ app_main_loop_worker(void) {\n \t\trte_lcore_id());\n \n \tworker_mbuf = rte_malloc_socket(NULL, sizeof(struct app_mbuf_array),\n-\t\t\tCACHE_LINE_SIZE, rte_socket_id());\n+\t\t\tRTE_CACHE_LINE_SIZE, rte_socket_id());\n \tif (worker_mbuf == NULL)\n \t\trte_panic(\"Worker thread: cannot allocate buffer space\\n\");\n \ndiff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c\nindex 12adafa..5f96899 100644\n--- a/app/test-pmd/testpmd.c\n+++ b/app/test-pmd/testpmd.c\n@@ -520,7 +520,7 @@ init_config(void)\n \t/* Configuration of logical cores. */\n \tfwd_lcores = rte_zmalloc(\"testpmd: fwd_lcores\",\n \t\t\t\tsizeof(struct fwd_lcore *) * nb_lcores,\n-\t\t\t\tCACHE_LINE_SIZE);\n+\t\t\t\tRTE_CACHE_LINE_SIZE);\n \tif (fwd_lcores == NULL) {\n \t\trte_exit(EXIT_FAILURE, \"rte_zmalloc(%d (struct fwd_lcore *)) \"\n \t\t\t\t\t\t\t\"failed\\n\", nb_lcores);\n@@ -528,7 +528,7 @@ init_config(void)\n \tfor (lc_id = 0; lc_id < nb_lcores; lc_id++) {\n \t\tfwd_lcores[lc_id] = rte_zmalloc(\"testpmd: struct fwd_lcore\",\n \t\t\t\t\t       sizeof(struct fwd_lcore),\n-\t\t\t\t\t       CACHE_LINE_SIZE);\n+\t\t\t\t\t       RTE_CACHE_LINE_SIZE);\n \t\tif (fwd_lcores[lc_id] == NULL) {\n \t\t\trte_exit(EXIT_FAILURE, \"rte_zmalloc(struct fwd_lcore) \"\n \t\t\t\t\t\t\t\t\"failed\\n\");\n@@ -566,7 +566,7 @@ init_config(void)\n \t/* Configuration of Ethernet ports. */\n \tports = rte_zmalloc(\"testpmd: ports\",\n \t\t\t    sizeof(struct rte_port) * nb_ports,\n-\t\t\t    CACHE_LINE_SIZE);\n+\t\t\t    RTE_CACHE_LINE_SIZE);\n \tif (ports == NULL) {\n \t\trte_exit(EXIT_FAILURE, \"rte_zmalloc(%d struct rte_port) \"\n \t\t\t\t\t\t\t\"failed\\n\", nb_ports);\n@@ -637,7 +637,7 @@ reconfig(portid_t new_port_id)\n \t/* Reconfiguration of Ethernet ports. */\n \tports = rte_realloc(ports,\n \t\t\t    sizeof(struct rte_port) * nb_ports,\n-\t\t\t    CACHE_LINE_SIZE);\n+\t\t\t    RTE_CACHE_LINE_SIZE);\n \tif (ports == NULL) {\n \t\trte_exit(EXIT_FAILURE, \"rte_realloc(%d struct rte_port) failed\\n\",\n \t\t\t\tnb_ports);\n@@ -713,14 +713,14 @@ init_fwd_streams(void)\n \t/* init new */\n \tnb_fwd_streams = nb_fwd_streams_new;\n \tfwd_streams = rte_zmalloc(\"testpmd: fwd_streams\",\n-\t\tsizeof(struct fwd_stream *) * nb_fwd_streams, CACHE_LINE_SIZE);\n+\t\tsizeof(struct fwd_stream *) * nb_fwd_streams, RTE_CACHE_LINE_SIZE);\n \tif (fwd_streams == NULL)\n \t\trte_exit(EXIT_FAILURE, \"rte_zmalloc(%d (struct fwd_stream *)) \"\n \t\t\t\t\t\t\"failed\\n\", nb_fwd_streams);\n \n \tfor (sm_id = 0; sm_id < nb_fwd_streams; sm_id++) {\n \t\tfwd_streams[sm_id] = rte_zmalloc(\"testpmd: struct fwd_stream\",\n-\t\t\t\tsizeof(struct fwd_stream), CACHE_LINE_SIZE);\n+\t\t\t\tsizeof(struct fwd_stream), RTE_CACHE_LINE_SIZE);\n \t\tif (fwd_streams[sm_id] == NULL)\n \t\t\trte_exit(EXIT_FAILURE, \"rte_zmalloc(struct fwd_stream)\"\n \t\t\t\t\t\t\t\t\" failed\\n\");\ndiff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h\nindex 9cbfeac..b4cb5bd 100644\n--- a/app/test-pmd/testpmd.h\n+++ b/app/test-pmd/testpmd.h\n@@ -67,8 +67,8 @@ int main(int argc, char **argv);\n \n #define DEF_MBUF_CACHE 250\n \n-#define CACHE_LINE_SIZE_ROUNDUP(size) \\\n-\t(CACHE_LINE_SIZE * ((size + CACHE_LINE_SIZE - 1) / CACHE_LINE_SIZE))\n+#define RTE_CACHE_LINE_SIZE_ROUNDUP(size) \\\n+\t(RTE_CACHE_LINE_SIZE * ((size + RTE_CACHE_LINE_SIZE - 1) / RTE_CACHE_LINE_SIZE))\n \n #define NUMA_NO_CONFIG 0xFF\n #define UMA_NO_CONFIG  0xFF\ndiff --git a/app/test/test_distributor_perf.c b/app/test/test_distributor_perf.c\nindex 48ee344..31431bb 100644\n--- a/app/test/test_distributor_perf.c\n+++ b/app/test/test_distributor_perf.c\n@@ -73,7 +73,7 @@ static void\n time_cache_line_switch(void)\n {\n \t/* allocate a full cache line for data, we use only first byte of it */\n-\tuint64_t data[CACHE_LINE_SIZE*3 / sizeof(uint64_t)];\n+\tuint64_t data[RTE_CACHE_LINE_SIZE*3 / sizeof(uint64_t)];\n \n \tunsigned i, slaveid = rte_get_next_lcore(rte_lcore_id(), 0, 0);\n \tvolatile uint64_t *pdata = &data[0];\ndiff --git a/app/test/test_ivshmem.c b/app/test/test_ivshmem.c\nindex 2996a86..4e61488 100644\n--- a/app/test/test_ivshmem.c\n+++ b/app/test/test_ivshmem.c\n@@ -136,13 +136,13 @@ test_ivshmem_create_lots_of_memzones(void)\n \tfor (i = 0; i < RTE_LIBRTE_IVSHMEM_MAX_ENTRIES; i++) {\n \t\tsnprintf(name, sizeof(name), \"mz_%i\", i);\n \n-\t\tmz = rte_memzone_reserve(name, CACHE_LINE_SIZE, SOCKET_ID_ANY, 0);\n+\t\tmz = rte_memzone_reserve(name, RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY, 0);\n \t\tASSERT(mz != NULL, \"Failed to reserve memzone\");\n \n \t\tASSERT(rte_ivshmem_metadata_add_memzone(mz, METADATA_NAME) == 0,\n \t\t\t\t\"Failed to add memzone\");\n \t}\n-\tmz = rte_memzone_reserve(\"one too many\", CACHE_LINE_SIZE, SOCKET_ID_ANY, 0);\n+\tmz = rte_memzone_reserve(\"one too many\", RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY, 0);\n \tASSERT(mz != NULL, \"Failed to reserve memzone\");\n \n \tASSERT(rte_ivshmem_metadata_add_memzone(mz, METADATA_NAME) < 0,\n@@ -159,7 +159,7 @@ test_ivshmem_create_duplicate_memzone(void)\n \tASSERT(rte_ivshmem_metadata_create(METADATA_NAME) == 0,\n \t\t\t\"Failed to create metadata\");\n \n-\tmz = rte_memzone_reserve(\"mz\", CACHE_LINE_SIZE, SOCKET_ID_ANY, 0);\n+\tmz = rte_memzone_reserve(\"mz\", RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY, 0);\n \tASSERT(mz != NULL, \"Failed to reserve memzone\");\n \n \tASSERT(rte_ivshmem_metadata_add_memzone(mz, METADATA_NAME) == 0,\ndiff --git a/app/test/test_malloc.c b/app/test/test_malloc.c\nindex ee34ca3..e8fac4b 100644\n--- a/app/test/test_malloc.c\n+++ b/app/test/test_malloc.c\n@@ -481,13 +481,13 @@ test_realloc(void)\n \tconst unsigned size4 = size3 + 1024;\n \n \t/* test data is the same even if element is moved*/\n-\tchar *ptr1 = rte_zmalloc(NULL, size1, CACHE_LINE_SIZE);\n+\tchar *ptr1 = rte_zmalloc(NULL, size1, RTE_CACHE_LINE_SIZE);\n \tif (!ptr1){\n \t\tprintf(\"NULL pointer returned from rte_zmalloc\\n\");\n \t\treturn -1;\n \t}\n \tsnprintf(ptr1, size1, \"%s\" ,hello_str);\n-\tchar *ptr2 = rte_realloc(ptr1, size2, CACHE_LINE_SIZE);\n+\tchar *ptr2 = rte_realloc(ptr1, size2, RTE_CACHE_LINE_SIZE);\n \tif (!ptr2){\n \t\trte_free(ptr1);\n \t\tprintf(\"NULL pointer returned from rte_realloc\\n\");\n@@ -511,7 +511,7 @@ test_realloc(void)\n \t/* now allocate third element, free the second\n \t * and resize third. It should not move. (ptr1 is now invalid)\n \t */\n-\tchar *ptr3 = rte_zmalloc(NULL, size3, CACHE_LINE_SIZE);\n+\tchar *ptr3 = rte_zmalloc(NULL, size3, RTE_CACHE_LINE_SIZE);\n \tif (!ptr3){\n \t\tprintf(\"NULL pointer returned from rte_zmalloc\\n\");\n \t\trte_free(ptr2);\n@@ -526,7 +526,7 @@ test_realloc(void)\n \t\t}\n \trte_free(ptr2);\n \t/* first resize to half the size of the freed block */\n-\tchar *ptr4 = rte_realloc(ptr3, size4, CACHE_LINE_SIZE);\n+\tchar *ptr4 = rte_realloc(ptr3, size4, RTE_CACHE_LINE_SIZE);\n \tif (!ptr4){\n \t\tprintf(\"NULL pointer returned from rte_realloc\\n\");\n \t\trte_free(ptr3);\n@@ -538,7 +538,7 @@ test_realloc(void)\n \t\treturn -1;\n \t}\n \t/* now resize again to the full size of the freed block */\n-\tptr4 = rte_realloc(ptr3, size3 + size2 + size1, CACHE_LINE_SIZE);\n+\tptr4 = rte_realloc(ptr3, size3 + size2 + size1, RTE_CACHE_LINE_SIZE);\n \tif (ptr3 != ptr4){\n \t\tprintf(\"Unexpected - ptr4 != ptr3 on second resize\\n\");\n \t\trte_free(ptr4);\n@@ -549,12 +549,12 @@ test_realloc(void)\n \t/* now try a resize to a smaller size, see if it works */\n \tconst unsigned size5 = 1024;\n \tconst unsigned size6 = size5 / 2;\n-\tchar *ptr5 = rte_malloc(NULL, size5, CACHE_LINE_SIZE);\n+\tchar *ptr5 = rte_malloc(NULL, size5, RTE_CACHE_LINE_SIZE);\n \tif (!ptr5){\n \t\tprintf(\"NULL pointer returned from rte_malloc\\n\");\n \t\treturn -1;\n \t}\n-\tchar *ptr6 = rte_realloc(ptr5, size6, CACHE_LINE_SIZE);\n+\tchar *ptr6 = rte_realloc(ptr5, size6, RTE_CACHE_LINE_SIZE);\n \tif (!ptr6){\n \t\tprintf(\"NULL pointer returned from rte_realloc\\n\");\n \t\trte_free(ptr5);\n@@ -569,8 +569,8 @@ test_realloc(void)\n \n \t/* check for behaviour changing alignment */\n \tconst unsigned size7 = 1024;\n-\tconst unsigned orig_align = CACHE_LINE_SIZE;\n-\tunsigned new_align = CACHE_LINE_SIZE * 2;\n+\tconst unsigned orig_align = RTE_CACHE_LINE_SIZE;\n+\tunsigned new_align = RTE_CACHE_LINE_SIZE * 2;\n \tchar *ptr7 = rte_malloc(NULL, size7, orig_align);\n \tif (!ptr7){\n \t\tprintf(\"NULL pointer returned from rte_malloc\\n\");\n@@ -597,18 +597,18 @@ test_realloc(void)\n \t */\n \tunsigned size9 = 1024, size10 = 1024;\n \tunsigned size11 = size9 + size10 + 256;\n-\tchar *ptr9 = rte_malloc(NULL, size9, CACHE_LINE_SIZE);\n+\tchar *ptr9 = rte_malloc(NULL, size9, RTE_CACHE_LINE_SIZE);\n \tif (!ptr9){\n \t\tprintf(\"NULL pointer returned from rte_malloc\\n\");\n \t\treturn -1;\n \t}\n-\tchar *ptr10 = rte_malloc(NULL, size10, CACHE_LINE_SIZE);\n+\tchar *ptr10 = rte_malloc(NULL, size10, RTE_CACHE_LINE_SIZE);\n \tif (!ptr10){\n \t\tprintf(\"NULL pointer returned from rte_malloc\\n\");\n \t\treturn -1;\n \t}\n \trte_free(ptr9);\n-\tchar *ptr11 = rte_realloc(ptr10, size11, CACHE_LINE_SIZE);\n+\tchar *ptr11 = rte_realloc(ptr10, size11, RTE_CACHE_LINE_SIZE);\n \tif (!ptr11){\n \t\tprintf(\"NULL pointer returned from rte_realloc\\n\");\n \t\trte_free(ptr10);\n@@ -625,7 +625,7 @@ test_realloc(void)\n \t * We should get a malloc of the size requested*/\n \tconst size_t size12 = 1024;\n \tsize_t size12_check;\n-\tchar *ptr12 = rte_realloc(NULL, size12, CACHE_LINE_SIZE);\n+\tchar *ptr12 = rte_realloc(NULL, size12, RTE_CACHE_LINE_SIZE);\n \tif (!ptr12){\n \t\tprintf(\"NULL pointer returned from rte_realloc\\n\");\n \t\treturn -1;\n@@ -698,7 +698,7 @@ test_rte_malloc_validate(void)\n {\n \tconst size_t request_size = 1024;\n \tsize_t allocated_size;\n-\tchar *data_ptr = rte_malloc(NULL, request_size, CACHE_LINE_SIZE);\n+\tchar *data_ptr = rte_malloc(NULL, request_size, RTE_CACHE_LINE_SIZE);\n #ifdef RTE_LIBRTE_MALLOC_DEBUG\n \tint retval;\n \tchar *over_write_vals = NULL;\n@@ -773,7 +773,7 @@ test_zero_aligned_alloc(void)\n \tchar *p1 = rte_malloc(NULL,1024, 0);\n \tif (!p1)\n \t\tgoto err_return;\n-\tif (!rte_is_aligned(p1, CACHE_LINE_SIZE))\n+\tif (!rte_is_aligned(p1, RTE_CACHE_LINE_SIZE))\n \t\tgoto err_return;\n \trte_free(p1);\n \treturn 0;\n@@ -789,7 +789,7 @@ test_malloc_bad_params(void)\n {\n \tconst char *type = NULL;\n \tsize_t size = 0;\n-\tunsigned align = CACHE_LINE_SIZE;\n+\tunsigned align = RTE_CACHE_LINE_SIZE;\n \n \t/* rte_malloc expected to return null with inappropriate size */\n \tchar *bad_ptr = rte_malloc(type, size, align);\ndiff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c\nindex 66bcbc5..a720759 100644\n--- a/app/test/test_mbuf.c\n+++ b/app/test/test_mbuf.c\n@@ -782,7 +782,7 @@ test_failing_mbuf_sanity_check(void)\n static int\n test_mbuf(void)\n {\n-\tRTE_BUILD_BUG_ON(sizeof(struct rte_mbuf) != CACHE_LINE_SIZE * 2);\n+\tRTE_BUILD_BUG_ON(sizeof(struct rte_mbuf) != RTE_CACHE_LINE_SIZE * 2);\n \n \t/* create pktmbuf pool if it does not exist */\n \tif (pktmbuf_pool == NULL) {\ndiff --git a/app/test/test_memzone.c b/app/test/test_memzone.c\nindex 381f643..b665fce 100644\n--- a/app/test/test_memzone.c\n+++ b/app/test/test_memzone.c\n@@ -281,7 +281,7 @@ test_memzone_reserve_max(void)\n \t\t\tcontinue;\n \n \t\t/* align everything */\n-\t\tlast_addr = RTE_PTR_ALIGN_CEIL(ms[memseg_idx].addr, CACHE_LINE_SIZE);\n+\t\tlast_addr = RTE_PTR_ALIGN_CEIL(ms[memseg_idx].addr, RTE_CACHE_LINE_SIZE);\n \t\tlen = ms[memseg_idx].len - RTE_PTR_DIFF(last_addr, ms[memseg_idx].addr);\n \t\tlen &= ~((size_t) CACHE_LINE_MASK);\n \n@@ -374,7 +374,7 @@ test_memzone_reserve_max_aligned(void)\n \t\t\tcontinue;\n \n \t\t/* align everything */\n-\t\tlast_addr = RTE_PTR_ALIGN_CEIL(ms[memseg_idx].addr, CACHE_LINE_SIZE);\n+\t\tlast_addr = RTE_PTR_ALIGN_CEIL(ms[memseg_idx].addr, RTE_CACHE_LINE_SIZE);\n \t\tlen = ms[memseg_idx].len - RTE_PTR_DIFF(last_addr, ms[memseg_idx].addr);\n \t\tlen &= ~((size_t) CACHE_LINE_MASK);\n \n@@ -589,7 +589,7 @@ check_memzone_bounded(const char *name, uint32_t len,  uint32_t align,\n \t}\n \n \tif ((mz->len & CACHE_LINE_MASK) != 0 || mz->len < len ||\n-\t\t\tmz->len < CACHE_LINE_SIZE) {\n+\t\t\tmz->len < RTE_CACHE_LINE_SIZE) {\n \t\tprintf(\"%s(%s): invalid length\\n\",\n \t\t\t__func__, mz->name);\n \t\treturn (-1);\n@@ -691,14 +691,14 @@ test_memzone_reserve_memory_in_smallest_segment(void)\n \tprev_min_len = prev_min_ms->len;\n \n \t/* try reserving a memzone in the smallest memseg */\n-\tmz = rte_memzone_reserve(\"smallest_mz\", CACHE_LINE_SIZE,\n+\tmz = rte_memzone_reserve(\"smallest_mz\", RTE_CACHE_LINE_SIZE,\n \t\t\tSOCKET_ID_ANY, 0);\n \tif (mz == NULL) {\n \t\tprintf(\"Failed to reserve memory from smallest memseg!\\n\");\n \t\treturn -1;\n \t}\n \tif (prev_min_ms->len != prev_min_len &&\n-\t\t\tmin_ms->len != min_len - CACHE_LINE_SIZE) {\n+\t\t\tmin_ms->len != min_len - RTE_CACHE_LINE_SIZE) {\n \t\tprintf(\"Reserved memory from wrong memseg!\\n\");\n \t\treturn -1;\n \t}\n@@ -737,7 +737,7 @@ test_memzone_reserve_memory_with_smallest_offset(void)\n \n \tmin_ms = NULL;  /*< smallest segment */\n \tprev_min_ms = NULL; /*< second smallest segment */\n-\talign = CACHE_LINE_SIZE * 4;\n+\talign = RTE_CACHE_LINE_SIZE * 4;\n \n \t/* find two smallest segments */\n \tfor (i = 0; i < RTE_MAX_MEMSEG; i++) {\n@@ -777,7 +777,7 @@ test_memzone_reserve_memory_with_smallest_offset(void)\n \n \t\t/* make sure final length is *not* aligned */\n \t\twhile (((min_ms->addr_64 + len) & (align-1)) == 0)\n-\t\t\tlen += CACHE_LINE_SIZE;\n+\t\t\tlen += RTE_CACHE_LINE_SIZE;\n \n \t\tif (rte_memzone_reserve(\"dummy_mz1\", len, SOCKET_ID_ANY, 0) == NULL) {\n \t\t\tprintf(\"Cannot reserve memory!\\n\");\n@@ -792,12 +792,12 @@ test_memzone_reserve_memory_with_smallest_offset(void)\n \t}\n     /* if we don't need to touch smallest segment but it's aligned */\n     else if ((min_ms->addr_64 & (align-1)) == 0) {\n-            if (rte_memzone_reserve(\"align_mz1\", CACHE_LINE_SIZE,\n+            if (rte_memzone_reserve(\"align_mz1\", RTE_CACHE_LINE_SIZE,\n                     SOCKET_ID_ANY, 0) == NULL) {\n                             printf(\"Cannot reserve memory!\\n\");\n                             return -1;\n             }\n-            if (min_ms->len != min_len - CACHE_LINE_SIZE) {\n+            if (min_ms->len != min_len - RTE_CACHE_LINE_SIZE) {\n                     printf(\"Reserved memory from wrong segment!\\n\");\n                     return -1;\n             }\n@@ -809,7 +809,7 @@ test_memzone_reserve_memory_with_smallest_offset(void)\n \n \t\t/* make sure final length is aligned */\n \t\twhile (((prev_min_ms->addr_64 + len) & (align-1)) != 0)\n-\t\t\tlen += CACHE_LINE_SIZE;\n+\t\t\tlen += RTE_CACHE_LINE_SIZE;\n \n \t\tif (rte_memzone_reserve(\"dummy_mz2\", len, SOCKET_ID_ANY, 0) == NULL) {\n \t\t\tprintf(\"Cannot reserve memory!\\n\");\n@@ -822,7 +822,7 @@ test_memzone_reserve_memory_with_smallest_offset(void)\n \t\t\treturn -1;\n \t\t}\n \t}\n-\tlen = CACHE_LINE_SIZE;\n+\tlen = RTE_CACHE_LINE_SIZE;\n \n \n \n@@ -860,7 +860,7 @@ test_memzone_reserve_remainder(void)\n \tint i, align;\n \n \tmin_len = 0;\n-\talign = CACHE_LINE_SIZE;\n+\talign = RTE_CACHE_LINE_SIZE;\n \n \tconfig = rte_eal_get_configuration();\n \n@@ -878,7 +878,7 @@ test_memzone_reserve_remainder(void)\n \t\t\tmin_ms = ms;\n \n \t\t\t/* find maximum alignment this segment is able to hold */\n-\t\t\talign = CACHE_LINE_SIZE;\n+\t\t\talign = RTE_CACHE_LINE_SIZE;\n \t\t\twhile ((ms->addr_64 & (align-1)) == 0) {\n \t\t\t\talign <<= 1;\n \t\t\t}\ndiff --git a/app/test/test_pmd_perf.c b/app/test/test_pmd_perf.c\nindex 1c1f236..941d099 100644\n--- a/app/test/test_pmd_perf.c\n+++ b/app/test/test_pmd_perf.c\n@@ -592,7 +592,7 @@ poll_burst(void *args)\n \tpkts_burst = (struct rte_mbuf **)\n \t\trte_calloc_socket(\"poll_burst\",\n \t\t\t\t  total, sizeof(void *),\n-\t\t\t\t  CACHE_LINE_SIZE, conf->socketid);\n+\t\t\t\t  RTE_CACHE_LINE_SIZE, conf->socketid);\n \tif (!pkts_burst)\n \t\treturn -1;\n \n@@ -797,7 +797,7 @@ test_pmd_perf(void)\n \t\t\trte_calloc_socket(\"tx_buff\",\n \t\t\t\t\t  MAX_TRAFFIC_BURST * nb_ports,\n \t\t\t\t\t  sizeof(void *),\n-\t\t\t\t\t  CACHE_LINE_SIZE, socketid);\n+\t\t\t\t\t  RTE_CACHE_LINE_SIZE, socketid);\n \t\tif (!tx_burst)\n \t\t\treturn -1;\n \t}\ndiff --git a/app/test/test_table.h b/app/test/test_table.h\nindex 40e50db..64e9427 100644\n--- a/app/test/test_table.h\n+++ b/app/test/test_table.h\n@@ -179,7 +179,7 @@ struct rte_table {\n \trte_pipeline_table_action_handler_hit f_action;\n \tuint32_t table_next_id;\n \tuint32_t table_next_id_valid;\n-\tuint8_t actions_lookup_miss[CACHE_LINE_SIZE];\n+\tuint8_t actions_lookup_miss[RTE_CACHE_LINE_SIZE];\n \tuint32_t action_data_size;\n \tvoid *h_table;\n };\ndiff --git a/doc/guides/sample_app_ug/kernel_nic_interface.rst b/doc/guides/sample_app_ug/kernel_nic_interface.rst\nindex 720142f..b75eed3 100644\n--- a/doc/guides/sample_app_ug/kernel_nic_interface.rst\n+++ b/doc/guides/sample_app_ug/kernel_nic_interface.rst\n@@ -392,7 +392,7 @@ The code is as follows:\n                 goto fail;\n             }\n \n-            kni_port_params_array[port_id] = (struct kni_port_params*)rte_zmalloc(\"KNI_port_params\", sizeof(struct kni_port_params), CACHE_LINE_SIZE);\n+            kni_port_params_array[port_id] = (struct kni_port_params*)rte_zmalloc(\"KNI_port_params\", sizeof(struct kni_port_params), RTE_CACHE_LINE_SIZE);\n             kni_port_params_array[port_id]->port_id = port_id;\n             kni_port_params_array[port_id]->lcore_rx = (uint8_t)int_fld[i++];\n             kni_port_params_array[port_id]->lcore_tx = (uint8_t)int_fld[i++];\ndiff --git a/examples/dpdk_qat/crypto.c b/examples/dpdk_qat/crypto.c\nindex 318d47c..213ffcb 100644\n--- a/examples/dpdk_qat/crypto.c\n+++ b/examples/dpdk_qat/crypto.c\n@@ -339,7 +339,7 @@ get_crypto_instance_on_core(CpaInstanceHandle *pInstanceHandle,\n \t}\n \n \tpLocalInstanceHandles = rte_malloc(\"pLocalInstanceHandles\",\n-\t\t\tsizeof(CpaInstanceHandle) * numInstances, CACHE_LINE_SIZE);\n+\t\t\tsizeof(CpaInstanceHandle) * numInstances, RTE_CACHE_LINE_SIZE);\n \n \tif (NULL == pLocalInstanceHandles) {\n \t\treturn CPA_STATUS_FAIL;\ndiff --git a/examples/ip_pipeline/cmdline.c b/examples/ip_pipeline/cmdline.c\nindex a56335e..13d565e 100644\n--- a/examples/ip_pipeline/cmdline.c\n+++ b/examples/ip_pipeline/cmdline.c\n@@ -568,7 +568,7 @@ cmd_arp_add_parsed(\n \t\t\tstruct app_rule *new_rule = (struct app_rule *)\n \t\t\t\trte_zmalloc_socket(\"CLI\",\n \t\t\t\tsizeof(struct app_rule),\n-\t\t\t\tCACHE_LINE_SIZE,\n+\t\t\t\tRTE_CACHE_LINE_SIZE,\n \t\t\t\trte_socket_id());\n \n \t\t\tif (new_rule == NULL)\n@@ -860,7 +860,7 @@ cmd_route_add_parsed(\n \t\t\tstruct app_rule *new_rule = (struct app_rule *)\n \t\t\t\trte_zmalloc_socket(\"CLI\",\n \t\t\t\tsizeof(struct app_rule),\n-\t\t\t\tCACHE_LINE_SIZE,\n+\t\t\t\tRTE_CACHE_LINE_SIZE,\n \t\t\t\trte_socket_id());\n \n \t\t\tif (new_rule == NULL)\n@@ -1193,7 +1193,7 @@ cmd_firewall_add_parsed(\n \t\t\tstruct app_rule *new_rule = (struct app_rule *)\n \t\t\t\trte_zmalloc_socket(\"CLI\",\n \t\t\t\tsizeof(struct app_rule),\n-\t\t\t\tCACHE_LINE_SIZE,\n+\t\t\t\tRTE_CACHE_LINE_SIZE,\n \t\t\t\trte_socket_id());\n \n \t\t\tmemcpy(new_rule, &rule, sizeof(rule));\n@@ -1673,7 +1673,7 @@ cmd_flow_add_parsed(\n \t\t\tstruct app_rule *new_rule = (struct app_rule *)\n \t\t\t\trte_zmalloc_socket(\"CLI\",\n \t\t\t\tsizeof(struct app_rule),\n-\t\t\t\tCACHE_LINE_SIZE,\n+\t\t\t\tRTE_CACHE_LINE_SIZE,\n \t\t\t\trte_socket_id());\n \n \t\t\tif (new_rule == NULL)\ndiff --git a/examples/ip_pipeline/init.c b/examples/ip_pipeline/init.c\nindex cb7568b..e0c0464 100644\n--- a/examples/ip_pipeline/init.c\n+++ b/examples/ip_pipeline/init.c\n@@ -419,7 +419,7 @@ app_init_rings(void)\n \tRTE_LOG(INFO, USER1, \"Initializing %u SW rings ...\\n\", n_swq);\n \n \tapp.rings = rte_malloc_socket(NULL, n_swq * sizeof(struct rte_ring *),\n-\t\tCACHE_LINE_SIZE, rte_socket_id());\n+\t\tRTE_CACHE_LINE_SIZE, rte_socket_id());\n \tif (app.rings == NULL)\n \t\trte_panic(\"Cannot allocate memory to store ring pointers\\n\");\n \n@@ -595,7 +595,7 @@ app_init_etc(void)\n void\n app_init(void)\n {\n-\tif ((sizeof(struct app_pkt_metadata) % CACHE_LINE_SIZE) != 0)\n+\tif ((sizeof(struct app_pkt_metadata) % RTE_CACHE_LINE_SIZE) != 0)\n \t\trte_panic(\"Application pkt meta-data size mismatch\\n\");\n \n \tapp_check_core_params();\ndiff --git a/examples/ip_pipeline/pipeline_passthrough.c b/examples/ip_pipeline/pipeline_passthrough.c\nindex 4af6f44..948b2c1 100644\n--- a/examples/ip_pipeline/pipeline_passthrough.c\n+++ b/examples/ip_pipeline/pipeline_passthrough.c\n@@ -188,7 +188,7 @@ app_main_loop_passthrough(void) {\n \t\tcore_id);\n \n \tm = rte_malloc_socket(NULL, sizeof(struct app_mbuf_array),\n-\t\tCACHE_LINE_SIZE, rte_socket_id());\n+\t\tRTE_CACHE_LINE_SIZE, rte_socket_id());\n \tif (m == NULL)\n \t\trte_panic(\"%s: cannot allocate buffer space\\n\", __func__);\n \ndiff --git a/examples/ip_pipeline/pipeline_rx.c b/examples/ip_pipeline/pipeline_rx.c\nindex 8f1f781..383f1a9 100644\n--- a/examples/ip_pipeline/pipeline_rx.c\n+++ b/examples/ip_pipeline/pipeline_rx.c\n@@ -295,7 +295,7 @@ app_main_loop_rx(void) {\n \tRTE_LOG(INFO, USER1, \"Core %u is doing RX (no pipeline)\\n\", core_id);\n \n \tma = rte_malloc_socket(NULL, sizeof(struct app_mbuf_array),\n-\t\tCACHE_LINE_SIZE, rte_socket_id());\n+\t\tRTE_CACHE_LINE_SIZE, rte_socket_id());\n \tif (ma == NULL)\n \t\trte_panic(\"%s: cannot allocate buffer space\\n\", __func__);\n \ndiff --git a/examples/ip_pipeline/pipeline_tx.c b/examples/ip_pipeline/pipeline_tx.c\nindex 64904b2..0077c12 100644\n--- a/examples/ip_pipeline/pipeline_tx.c\n+++ b/examples/ip_pipeline/pipeline_tx.c\n@@ -234,7 +234,7 @@ app_main_loop_tx(void) {\n \n \tfor (i = 0; i < APP_MAX_PORTS; i++) {\n \t\tm[i] = rte_malloc_socket(NULL, sizeof(struct app_mbuf_array),\n-\t\t\tCACHE_LINE_SIZE, rte_socket_id());\n+\t\t\tRTE_CACHE_LINE_SIZE, rte_socket_id());\n \t\tif (m[i] == NULL)\n \t\t\trte_panic(\"%s: Cannot allocate buffer space\\n\",\n \t\t\t\t__func__);\ndiff --git a/examples/ip_reassembly/main.c b/examples/ip_reassembly/main.c\nindex 39d60ec..780099d 100644\n--- a/examples/ip_reassembly/main.c\n+++ b/examples/ip_reassembly/main.c\n@@ -860,7 +860,7 @@ setup_port_tbl(struct lcore_queue_conf *qconf, uint32_t lcore, int socket,\n \tn = RTE_MAX(max_flow_num, 2UL * MAX_PKT_BURST);\n \tsz = sizeof (*mtb) + sizeof (mtb->m_table[0]) *  n;\n \n-\tif ((mtb = rte_zmalloc_socket(__func__, sz, CACHE_LINE_SIZE,\n+\tif ((mtb = rte_zmalloc_socket(__func__, sz, RTE_CACHE_LINE_SIZE,\n \t\t\tsocket)) == NULL) {\n \t\tRTE_LOG(ERR, IP_RSMBL, \"%s() for lcore: %u, port: %u \"\n \t\t\t\"failed to allocate %zu bytes\\n\",\ndiff --git a/examples/kni/main.c b/examples/kni/main.c\nindex 47cc873..45b96bc 100644\n--- a/examples/kni/main.c\n+++ b/examples/kni/main.c\n@@ -463,7 +463,7 @@ parse_config(const char *arg)\n \t\t}\n \t\tkni_port_params_array[port_id] =\n \t\t\t(struct kni_port_params*)rte_zmalloc(\"KNI_port_params\",\n-\t\t\tsizeof(struct kni_port_params), CACHE_LINE_SIZE);\n+\t\t\tsizeof(struct kni_port_params), RTE_CACHE_LINE_SIZE);\n \t\tkni_port_params_array[port_id]->port_id = port_id;\n \t\tkni_port_params_array[port_id]->lcore_rx =\n \t\t\t\t\t(uint8_t)int_fld[i++];\ndiff --git a/examples/multi_process/l2fwd_fork/flib.c b/examples/multi_process/l2fwd_fork/flib.c\nindex aace308..095e2f7 100644\n--- a/examples/multi_process/l2fwd_fork/flib.c\n+++ b/examples/multi_process/l2fwd_fork/flib.c\n@@ -180,7 +180,7 @@ lcore_id_init(void)\n \t/* Setup lcore ID allocation map */\n \tlcore_cfg = rte_zmalloc(\"LCORE_ID_MAP\",\n \t\t\t\t\t\tsizeof(uint16_t) * RTE_MAX_LCORE,\n-\t\t\t\t\t\tCACHE_LINE_SIZE);\n+\t\t\t\t\t\tRTE_CACHE_LINE_SIZE);\n \n \tif(lcore_cfg == NULL)\n \t\trte_panic(\"Failed to malloc\\n\");\n@@ -300,7 +300,7 @@ flib_init(void)\n {\n \tif ((core_cfg = rte_zmalloc(\"core_cfg\",\n \t\tsizeof(struct lcore_stat) * RTE_MAX_LCORE,\n-\t\tCACHE_LINE_SIZE)) == NULL ) {\n+\t\tRTE_CACHE_LINE_SIZE)) == NULL ) {\n \t\tprintf(\"rte_zmalloc failed\\n\");\n \t\treturn -1;\n \t}\ndiff --git a/examples/multi_process/symmetric_mp/main.c b/examples/multi_process/symmetric_mp/main.c\nindex ff48f20..01faae9 100644\n--- a/examples/multi_process/symmetric_mp/main.c\n+++ b/examples/multi_process/symmetric_mp/main.c\n@@ -101,7 +101,7 @@ struct port_stats{\n \tunsigned rx;\n \tunsigned tx;\n \tunsigned drop;\n-} __attribute__((aligned(CACHE_LINE_SIZE / 2)));\n+} __attribute__((aligned(RTE_CACHE_LINE_SIZE / 2)));\n \n static int proc_id = -1;\n static unsigned num_procs = 0;\ndiff --git a/examples/netmap_compat/lib/compat_netmap.c b/examples/netmap_compat/lib/compat_netmap.c\nindex 2348366..6a4737a 100644\n--- a/examples/netmap_compat/lib/compat_netmap.c\n+++ b/examples/netmap_compat/lib/compat_netmap.c\n@@ -643,12 +643,12 @@ rte_netmap_init(const struct rte_netmap_conf *conf)\n \tnmif_sz = NETMAP_IF_RING_OFS(port_rings, port_rings, port_slots);\n \tsz = nmif_sz * port_num;\n \n-\tbuf_ofs = RTE_ALIGN_CEIL(sz, CACHE_LINE_SIZE);\n+\tbuf_ofs = RTE_ALIGN_CEIL(sz, RTE_CACHE_LINE_SIZE);\n \tsz = buf_ofs + port_bufs * conf->max_bufsz * port_num;\n \n \tif (sz > UINT32_MAX ||\n \t\t\t(netmap.mem = rte_zmalloc_socket(__func__, sz,\n-\t\t\tCACHE_LINE_SIZE, conf->socket_id)) == NULL) {\n+\t\t\tRTE_CACHE_LINE_SIZE, conf->socket_id)) == NULL) {\n \t\tRTE_LOG(ERR, USER1, \"%s: failed to allocate %zu bytes\\n\",\n \t\t\t__func__, sz);\n \t\treturn (-ENOMEM);\ndiff --git a/examples/qos_sched/main.c b/examples/qos_sched/main.c\nindex 19a4f85..8114350 100644\n--- a/examples/qos_sched/main.c\n+++ b/examples/qos_sched/main.c\n@@ -135,7 +135,7 @@ app_main_loop(__attribute__((unused))void *dummy)\n \telse if (mode == (APP_TX_MODE | APP_WT_MODE)) {\n \t\tfor (i = 0; i < wt_idx; i++) {\n \t\t\twt_confs[i]->m_table = rte_malloc(\"table_wt\", sizeof(struct rte_mbuf *)\n-\t\t\t\t\t* burst_conf.tx_burst, CACHE_LINE_SIZE);\n+\t\t\t\t\t* burst_conf.tx_burst, RTE_CACHE_LINE_SIZE);\n \n \t\t\tif (wt_confs[i]->m_table == NULL)\n \t\t\t\trte_panic(\"flow %u unable to allocate memory buffer\\n\", i);\n@@ -150,7 +150,7 @@ app_main_loop(__attribute__((unused))void *dummy)\n \telse if (mode == APP_TX_MODE) {\n \t\tfor (i = 0; i < tx_idx; i++) {\n \t\t\ttx_confs[i]->m_table = rte_malloc(\"table_tx\", sizeof(struct rte_mbuf *)\n-\t\t\t\t\t* burst_conf.tx_burst, CACHE_LINE_SIZE);\n+\t\t\t\t\t* burst_conf.tx_burst, RTE_CACHE_LINE_SIZE);\n \n \t\t\tif (tx_confs[i]->m_table == NULL)\n \t\t\t\trte_panic(\"flow %u unable to allocate memory buffer\\n\", i);\ndiff --git a/examples/vhost/main.c b/examples/vhost/main.c\nindex 1f1edbe..f9b14c3 100644\n--- a/examples/vhost/main.c\n+++ b/examples/vhost/main.c\n@@ -156,7 +156,7 @@\n #define MAC_ADDR_CMP 0xFFFFFFFFFFFFULL\n \n /* Number of descriptors per cacheline. */\n-#define DESC_PER_CACHELINE (CACHE_LINE_SIZE / sizeof(struct vring_desc))\n+#define DESC_PER_CACHELINE (RTE_CACHE_LINE_SIZE / sizeof(struct vring_desc))\n \n /* mask of enabled ports */\n static uint32_t enabled_port_mask = 0;\n@@ -2562,7 +2562,7 @@ new_device (struct virtio_net *dev)\n \tstruct vhost_dev *vdev;\n \tuint32_t regionidx;\n \n-\tvdev = rte_zmalloc(\"vhost device\", sizeof(*vdev), CACHE_LINE_SIZE);\n+\tvdev = rte_zmalloc(\"vhost device\", sizeof(*vdev), RTE_CACHE_LINE_SIZE);\n \tif (vdev == NULL) {\n \t\tRTE_LOG(INFO, VHOST_DATA, \"(%\"PRIu64\") Couldn't allocate memory for vhost dev\\n\",\n \t\t\tdev->device_fh);\n@@ -2584,7 +2584,7 @@ new_device (struct virtio_net *dev)\n \n \t\tvdev->regions_hpa = (struct virtio_memory_regions_hpa *) rte_zmalloc(\"vhost hpa region\",\n \t\t\tsizeof(struct virtio_memory_regions_hpa) * vdev->nregions_hpa,\n-\t\t\tCACHE_LINE_SIZE);\n+\t\t\tRTE_CACHE_LINE_SIZE);\n \t\tif (vdev->regions_hpa == NULL) {\n \t\t\tRTE_LOG(ERR, VHOST_CONFIG, \"Cannot allocate memory for hpa region\\n\");\n \t\t\trte_free(vdev);\ndiff --git a/examples/vhost_xen/vhost_monitor.c b/examples/vhost_xen/vhost_monitor.c\nindex 6994c9c..f683989 100644\n--- a/examples/vhost_xen/vhost_monitor.c\n+++ b/examples/vhost_xen/vhost_monitor.c\n@@ -255,8 +255,8 @@ virtio_net_config_ll *new_device(unsigned int virtio_idx, struct xen_guest *gues\n \n \t/* Setup device and virtqueues. */\n \tnew_ll_dev   = calloc(1, sizeof(struct virtio_net_config_ll));\n-\tvirtqueue_rx = rte_zmalloc(NULL, sizeof(struct vhost_virtqueue), CACHE_LINE_SIZE);\n-\tvirtqueue_tx = rte_zmalloc(NULL, sizeof(struct vhost_virtqueue), CACHE_LINE_SIZE);\n+\tvirtqueue_rx = rte_zmalloc(NULL, sizeof(struct vhost_virtqueue), RTE_CACHE_LINE_SIZE);\n+\tvirtqueue_tx = rte_zmalloc(NULL, sizeof(struct vhost_virtqueue), RTE_CACHE_LINE_SIZE);\n \tif (new_ll_dev == NULL || virtqueue_rx == NULL || virtqueue_tx == NULL)\n \t\tgoto err;\n \ndiff --git a/lib/librte_acl/acl_gen.c b/lib/librte_acl/acl_gen.c\nindex f65e397..b1f766b 100644\n--- a/lib/librte_acl/acl_gen.c\n+++ b/lib/librte_acl/acl_gen.c\n@@ -415,12 +415,12 @@ rte_acl_gen(struct rte_acl_ctx *ctx, struct rte_acl_trie *trie,\n \t\tnode_bld_trie, num_tries, match_num);\n \n \t/* Allocate runtime memory (align to cache boundary) */\n-\ttotal_size = RTE_ALIGN(data_index_sz, CACHE_LINE_SIZE) +\n+\ttotal_size = RTE_ALIGN(data_index_sz, RTE_CACHE_LINE_SIZE) +\n \t\tindices.match_index * sizeof(uint64_t) +\n \t\t(match_num + 2) * sizeof(struct rte_acl_match_results) +\n \t\tXMM_SIZE;\n \n-\tmem = rte_zmalloc_socket(ctx->name, total_size, CACHE_LINE_SIZE,\n+\tmem = rte_zmalloc_socket(ctx->name, total_size, RTE_CACHE_LINE_SIZE,\n \t\t\tctx->socket_id);\n \tif (mem == NULL) {\n \t\tRTE_LOG(ERR, ACL,\n@@ -432,7 +432,7 @@ rte_acl_gen(struct rte_acl_ctx *ctx, struct rte_acl_trie *trie,\n \t/* Fill the runtime structure */\n \tmatch_index = indices.match_index;\n \tnode_array = (uint64_t *)((uintptr_t)mem +\n-\t\tRTE_ALIGN(data_index_sz, CACHE_LINE_SIZE));\n+\t\tRTE_ALIGN(data_index_sz, RTE_CACHE_LINE_SIZE));\n \n \t/*\n \t * Setup the NOMATCH node (a SINGLE at the\ndiff --git a/lib/librte_acl/rte_acl.c b/lib/librte_acl/rte_acl.c\nindex 4b21b8e..547e6da 100644\n--- a/lib/librte_acl/rte_acl.c\n+++ b/lib/librte_acl/rte_acl.c\n@@ -203,7 +203,7 @@ rte_acl_create(const struct rte_acl_param *param)\n \t\t\tgoto exit;\n \t\t}\n \n-\t\tctx = rte_zmalloc_socket(name, sz, CACHE_LINE_SIZE, param->socket_id);\n+\t\tctx = rte_zmalloc_socket(name, sz, RTE_CACHE_LINE_SIZE, param->socket_id);\n \n \t\tif (ctx == NULL) {\n \t\t\tRTE_LOG(ERR, ACL,\ndiff --git a/lib/librte_acl/rte_acl_osdep_alone.h b/lib/librte_acl/rte_acl_osdep_alone.h\nindex bdeba54..73d1701 100644\n--- a/lib/librte_acl/rte_acl_osdep_alone.h\n+++ b/lib/librte_acl/rte_acl_osdep_alone.h\n@@ -180,13 +180,13 @@ rte_rdtsc(void)\n  * rte_memory related.\n  */\n #define\tSOCKET_ID_ANY\t-1                  /**< Any NUMA socket. */\n-#define\tCACHE_LINE_SIZE\t64                  /**< Cache line size. */\n-#define\tCACHE_LINE_MASK\t(CACHE_LINE_SIZE-1) /**< Cache line mask. */\n+#define\tRTE_CACHE_LINE_SIZE\t64                  /**< Cache line size. */\n+#define\tCACHE_LINE_MASK\t(RTE_CACHE_LINE_SIZE-1) /**< Cache line mask. */\n \n /**\n  * Force alignment to cache line.\n  */\n-#define\t__rte_cache_aligned\t__attribute__((__aligned__(CACHE_LINE_SIZE)))\n+#define\t__rte_cache_aligned\t__attribute__((__aligned__(RTE_CACHE_LINE_SIZE)))\n \n \n /*\ndiff --git a/lib/librte_distributor/rte_distributor.c b/lib/librte_distributor/rte_distributor.c\nindex 2c5d61c..0b4178c 100644\n--- a/lib/librte_distributor/rte_distributor.c\n+++ b/lib/librte_distributor/rte_distributor.c\n@@ -77,7 +77,7 @@\n  */\n union rte_distributor_buffer {\n \tvolatile int64_t bufptr64;\n-\tchar pad[CACHE_LINE_SIZE*3];\n+\tchar pad[RTE_CACHE_LINE_SIZE*3];\n } __rte_cache_aligned;\n \n struct rte_distributor_backlog {\ndiff --git a/lib/librte_eal/common/eal_common_memzone.c b/lib/librte_eal/common/eal_common_memzone.c\nindex 5acd9ce..18e4f38 100644\n--- a/lib/librte_eal/common/eal_common_memzone.c\n+++ b/lib/librte_eal/common/eal_common_memzone.c\n@@ -86,7 +86,7 @@ rte_memzone_reserve(const char *name, size_t len, int socket_id,\n \t\t      unsigned flags)\n {\n \treturn rte_memzone_reserve_aligned(name,\n-\t\t\tlen, socket_id, flags, CACHE_LINE_SIZE);\n+\t\t\tlen, socket_id, flags, RTE_CACHE_LINE_SIZE);\n }\n \n /*\n@@ -164,8 +164,8 @@ memzone_reserve_aligned_thread_unsafe(const char *name, size_t len,\n \t}\n \n \t/* alignment less than cache size is not allowed */\n-\tif (align < CACHE_LINE_SIZE)\n-\t\talign = CACHE_LINE_SIZE;\n+\tif (align < RTE_CACHE_LINE_SIZE)\n+\t\talign = RTE_CACHE_LINE_SIZE;\n \n \n \t/* align length on cache boundary. Check for overflow before doing so */\n@@ -178,7 +178,7 @@ memzone_reserve_aligned_thread_unsafe(const char *name, size_t len,\n \tlen &= ~((size_t) CACHE_LINE_MASK);\n \n \t/* save minimal requested  length */\n-\trequested_len = RTE_MAX((size_t)CACHE_LINE_SIZE,  len);\n+\trequested_len = RTE_MAX((size_t)RTE_CACHE_LINE_SIZE,  len);\n \n \t/* check that boundary condition is valid */\n \tif (bound != 0 &&\n@@ -432,13 +432,13 @@ memseg_sanitize(struct rte_memseg *memseg)\n \t\treturn -1;\n \n \t/* memseg is really too small, don't bother with it */\n-\tif (memseg->len < (2 * CACHE_LINE_SIZE)) {\n+\tif (memseg->len < (2 * RTE_CACHE_LINE_SIZE)) {\n \t\tmemseg->len = 0;\n \t\treturn 0;\n \t}\n \n \t/* align start address */\n-\toff = (CACHE_LINE_SIZE - phys_align) & CACHE_LINE_MASK;\n+\toff = (RTE_CACHE_LINE_SIZE - phys_align) & CACHE_LINE_MASK;\n \tmemseg->phys_addr += off;\n \tmemseg->addr = (char *)memseg->addr + off;\n \tmemseg->len -= off;\ndiff --git a/lib/librte_eal/common/include/rte_memory.h b/lib/librte_eal/common/include/rte_memory.h\nindex 4cf8ea9..0502793 100644\n--- a/lib/librte_eal/common/include/rte_memory.h\n+++ b/lib/librte_eal/common/include/rte_memory.h\n@@ -59,19 +59,19 @@ enum rte_page_sizes {\n };\n \n #define SOCKET_ID_ANY -1                    /**< Any NUMA socket. */\n-#ifndef CACHE_LINE_SIZE\n-#define CACHE_LINE_SIZE 64                  /**< Cache line size. */\n+#ifndef RTE_CACHE_LINE_SIZE\n+#define RTE_CACHE_LINE_SIZE 64                  /**< Cache line size. */\n #endif\n-#define CACHE_LINE_MASK (CACHE_LINE_SIZE-1) /**< Cache line mask. */\n+#define CACHE_LINE_MASK (RTE_CACHE_LINE_SIZE-1) /**< Cache line mask. */\n \n #define CACHE_LINE_ROUNDUP(size) \\\n-\t(CACHE_LINE_SIZE * ((size + CACHE_LINE_SIZE - 1) / CACHE_LINE_SIZE))\n+\t(RTE_CACHE_LINE_SIZE * ((size + RTE_CACHE_LINE_SIZE - 1) / RTE_CACHE_LINE_SIZE))\n /**< Return the first cache-aligned value greater or equal to size. */\n \n /**\n  * Force alignment to cache line.\n  */\n-#define __rte_cache_aligned __attribute__((__aligned__(CACHE_LINE_SIZE)))\n+#define __rte_cache_aligned __attribute__((__aligned__(RTE_CACHE_LINE_SIZE)))\n \n typedef uint64_t phys_addr_t; /**< Physical address definition. */\n #define RTE_BAD_PHYS_ADDR ((phys_addr_t)-1)\ndiff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c\nindex 8c65d72..6eadbe5 100644\n--- a/lib/librte_ether/rte_ethdev.c\n+++ b/lib/librte_ether/rte_ethdev.c\n@@ -256,7 +256,7 @@ rte_eth_dev_init(struct rte_pci_driver *pci_drv,\n \tif (rte_eal_process_type() == RTE_PROC_PRIMARY){\n \t\teth_dev->data->dev_private = rte_zmalloc(\"ethdev private structure\",\n \t\t\t\t  eth_drv->dev_private_size,\n-\t\t\t\t  CACHE_LINE_SIZE);\n+\t\t\t\t  RTE_CACHE_LINE_SIZE);\n \t\tif (eth_dev->data->dev_private == NULL)\n \t\t\trte_panic(\"Cannot allocate memzone for private port data\\n\");\n \t}\n@@ -332,7 +332,7 @@ rte_eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)\n \tif (dev->data->rx_queues == NULL) { /* first time configuration */\n \t\tdev->data->rx_queues = rte_zmalloc(\"ethdev->rx_queues\",\n \t\t\t\tsizeof(dev->data->rx_queues[0]) * nb_queues,\n-\t\t\t\tCACHE_LINE_SIZE);\n+\t\t\t\tRTE_CACHE_LINE_SIZE);\n \t\tif (dev->data->rx_queues == NULL) {\n \t\t\tdev->data->nb_rx_queues = 0;\n \t\t\treturn -(ENOMEM);\n@@ -345,7 +345,7 @@ rte_eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)\n \t\tfor (i = nb_queues; i < old_nb_queues; i++)\n \t\t\t(*dev->dev_ops->rx_queue_release)(rxq[i]);\n \t\trxq = rte_realloc(rxq, sizeof(rxq[0]) * nb_queues,\n-\t\t\t\tCACHE_LINE_SIZE);\n+\t\t\t\tRTE_CACHE_LINE_SIZE);\n \t\tif (rxq == NULL)\n \t\t\treturn -(ENOMEM);\n \n@@ -474,7 +474,7 @@ rte_eth_dev_tx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)\n \tif (dev->data->tx_queues == NULL) { /* first time configuration */\n \t\tdev->data->tx_queues = rte_zmalloc(\"ethdev->tx_queues\",\n \t\t\t\tsizeof(dev->data->tx_queues[0]) * nb_queues,\n-\t\t\t\tCACHE_LINE_SIZE);\n+\t\t\t\tRTE_CACHE_LINE_SIZE);\n \t\tif (dev->data->tx_queues == NULL) {\n \t\t\tdev->data->nb_tx_queues = 0;\n \t\t\treturn -(ENOMEM);\n@@ -487,7 +487,7 @@ rte_eth_dev_tx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)\n \t\tfor (i = nb_queues; i < old_nb_queues; i++)\n \t\t\t(*dev->dev_ops->tx_queue_release)(txq[i]);\n \t\ttxq = rte_realloc(txq, sizeof(txq[0]) * nb_queues,\n-\t\t\t\tCACHE_LINE_SIZE);\n+\t\t\t\tRTE_CACHE_LINE_SIZE);\n \t\tif (txq == NULL)\n \t\t\treturn -(ENOMEM);\n \ndiff --git a/lib/librte_hash/rte_hash.c b/lib/librte_hash/rte_hash.c\nindex d02b6b4..ba827d2 100644\n--- a/lib/librte_hash/rte_hash.c\n+++ b/lib/librte_hash/rte_hash.c\n@@ -39,7 +39,7 @@\n #include <sys/queue.h>\n \n #include <rte_common.h>\n-#include <rte_memory.h>         /* for definition of CACHE_LINE_SIZE */\n+#include <rte_memory.h>         /* for definition of RTE_CACHE_LINE_SIZE */\n #include <rte_log.h>\n #include <rte_memcpy.h>\n #include <rte_prefetch.h>\n@@ -206,11 +206,11 @@ rte_hash_create(const struct rte_hash_parameters *params)\n \t\t\t\t     sizeof(hash_sig_t), SIG_BUCKET_ALIGNMENT);\n \tkey_size =  align_size(params->key_len, KEY_ALIGNMENT);\n \n-\thash_tbl_size = align_size(sizeof(struct rte_hash), CACHE_LINE_SIZE);\n+\thash_tbl_size = align_size(sizeof(struct rte_hash), RTE_CACHE_LINE_SIZE);\n \tsig_tbl_size = align_size(num_buckets * sig_bucket_size,\n-\t\t\t\t  CACHE_LINE_SIZE);\n+\t\t\t\t  RTE_CACHE_LINE_SIZE);\n \tkey_tbl_size = align_size(num_buckets * key_size *\n-\t\t\t\t  params->bucket_entries, CACHE_LINE_SIZE);\n+\t\t\t\t  params->bucket_entries, RTE_CACHE_LINE_SIZE);\n \n \t/* Total memory required for hash context */\n \tmem_size = hash_tbl_size + sig_tbl_size + key_tbl_size;\n@@ -233,7 +233,7 @@ rte_hash_create(const struct rte_hash_parameters *params)\n \t}\n \n \th = (struct rte_hash *)rte_zmalloc_socket(hash_name, mem_size,\n-\t\t\t\t\t   CACHE_LINE_SIZE, params->socket_id);\n+\t\t\t\t\t   RTE_CACHE_LINE_SIZE, params->socket_id);\n \tif (h == NULL) {\n \t\tRTE_LOG(ERR, HASH, \"memory allocation failed\\n\");\n \t\trte_free(te);\ndiff --git a/lib/librte_ip_frag/rte_ip_frag_common.c b/lib/librte_ip_frag/rte_ip_frag_common.c\nindex e4d16d0..c982d8c 100644\n--- a/lib/librte_ip_frag/rte_ip_frag_common.c\n+++ b/lib/librte_ip_frag/rte_ip_frag_common.c\n@@ -87,7 +87,7 @@ rte_ip_frag_table_create(uint32_t bucket_num, uint32_t bucket_entries,\n \t}\n \n \tsz = sizeof (*tbl) + nb_entries * sizeof (tbl->pkt[0]);\n-\tif ((tbl = rte_zmalloc_socket(__func__, sz, CACHE_LINE_SIZE,\n+\tif ((tbl = rte_zmalloc_socket(__func__, sz, RTE_CACHE_LINE_SIZE,\n \t\t\tsocket_id)) == NULL) {\n \t\tRTE_LOG(ERR, USER1,\n \t\t\t\"%s: allocation of %zu bytes at socket %d failed do\\n\",\ndiff --git a/lib/librte_lpm/rte_lpm.c b/lib/librte_lpm/rte_lpm.c\nindex 9e76988..983e04b 100644\n--- a/lib/librte_lpm/rte_lpm.c\n+++ b/lib/librte_lpm/rte_lpm.c\n@@ -42,7 +42,7 @@\n #include <rte_log.h>\n #include <rte_branch_prediction.h>\n #include <rte_common.h>\n-#include <rte_memory.h>        /* for definition of CACHE_LINE_SIZE */\n+#include <rte_memory.h>        /* for definition of RTE_CACHE_LINE_SIZE */\n #include <rte_malloc.h>\n #include <rte_memzone.h>\n #include <rte_tailq.h>\n@@ -199,7 +199,7 @@ rte_lpm_create(const char *name, int socket_id, int max_rules,\n \n \t/* Allocate memory to store the LPM data structures. */\n \tlpm = (struct rte_lpm *)rte_zmalloc_socket(mem_name, mem_size,\n-\t\t\tCACHE_LINE_SIZE, socket_id);\n+\t\t\tRTE_CACHE_LINE_SIZE, socket_id);\n \tif (lpm == NULL) {\n \t\tRTE_LOG(ERR, LPM, \"LPM memory allocation failed\\n\");\n \t\trte_free(te);\ndiff --git a/lib/librte_lpm/rte_lpm6.c b/lib/librte_lpm/rte_lpm6.c\nindex 9157103..42e6d80 100644\n--- a/lib/librte_lpm/rte_lpm6.c\n+++ b/lib/librte_lpm/rte_lpm6.c\n@@ -195,7 +195,7 @@ rte_lpm6_create(const char *name, int socket_id,\n \n \t/* Allocate memory to store the LPM data structures. */\n \tlpm = (struct rte_lpm6 *)rte_zmalloc_socket(mem_name, (size_t)mem_size,\n-\t\t\tCACHE_LINE_SIZE, socket_id);\n+\t\t\tRTE_CACHE_LINE_SIZE, socket_id);\n \n \tif (lpm == NULL) {\n \t\tRTE_LOG(ERR, LPM, \"LPM memory allocation failed\\n\");\n@@ -204,7 +204,7 @@ rte_lpm6_create(const char *name, int socket_id,\n \t}\n \n \tlpm->rules_tbl = (struct rte_lpm6_rule *)rte_zmalloc_socket(NULL,\n-\t\t\t(size_t)rules_size, CACHE_LINE_SIZE, socket_id);\n+\t\t\t(size_t)rules_size, RTE_CACHE_LINE_SIZE, socket_id);\n \n \tif (lpm->rules_tbl == NULL) {\n \t\tRTE_LOG(ERR, LPM, \"LPM memory allocation failed\\n\");\ndiff --git a/lib/librte_malloc/malloc_elem.c b/lib/librte_malloc/malloc_elem.c\nindex 75a94d0..ef26e47 100644\n--- a/lib/librte_malloc/malloc_elem.c\n+++ b/lib/librte_malloc/malloc_elem.c\n@@ -50,7 +50,7 @@\n #include \"malloc_elem.h\"\n #include \"malloc_heap.h\"\n \n-#define MIN_DATA_SIZE (CACHE_LINE_SIZE)\n+#define MIN_DATA_SIZE (RTE_CACHE_LINE_SIZE)\n \n /*\n  * initialise a general malloc_elem header structure\n@@ -308,7 +308,7 @@ malloc_elem_resize(struct malloc_elem *elem, size_t size)\n \tif (elem->size - new_size >= MIN_DATA_SIZE + MALLOC_ELEM_OVERHEAD){\n \t\t/* now we have a big block together. Lets cut it down a bit, by splitting */\n \t\tstruct malloc_elem *split_pt = RTE_PTR_ADD(elem, new_size);\n-\t\tsplit_pt = RTE_PTR_ALIGN_CEIL(split_pt, CACHE_LINE_SIZE);\n+\t\tsplit_pt = RTE_PTR_ALIGN_CEIL(split_pt, RTE_CACHE_LINE_SIZE);\n \t\tsplit_elem(elem, split_pt);\n \t\tmalloc_elem_free_list_insert(split_pt);\n \t}\ndiff --git a/lib/librte_malloc/malloc_elem.h b/lib/librte_malloc/malloc_elem.h\nindex 1d666a5..72f22a1 100644\n--- a/lib/librte_malloc/malloc_elem.h\n+++ b/lib/librte_malloc/malloc_elem.h\n@@ -74,7 +74,7 @@ set_trailer(struct malloc_elem *elem __rte_unused){ }\n \n \n #else\n-static const unsigned MALLOC_ELEM_TRAILER_LEN = CACHE_LINE_SIZE;\n+static const unsigned MALLOC_ELEM_TRAILER_LEN = RTE_CACHE_LINE_SIZE;\n \n #define MALLOC_HEADER_COOKIE   0xbadbadbadadd2e55ULL /**< Header cookie. */\n #define MALLOC_TRAILER_COOKIE  0xadd2e55badbadbadULL /**< Trailer cookie.*/\ndiff --git a/lib/librte_malloc/malloc_heap.c b/lib/librte_malloc/malloc_heap.c\nindex 94be0af..a1d0ebb 100644\n--- a/lib/librte_malloc/malloc_heap.c\n+++ b/lib/librte_malloc/malloc_heap.c\n@@ -109,7 +109,7 @@ malloc_heap_add_memzone(struct malloc_heap *heap, size_t size, unsigned align)\n \tstruct malloc_elem *start_elem = (struct malloc_elem *)mz->addr;\n \tstruct malloc_elem *end_elem = RTE_PTR_ADD(mz->addr,\n \t\t\tmz_size - MALLOC_ELEM_OVERHEAD);\n-\tend_elem = RTE_PTR_ALIGN_FLOOR(end_elem, CACHE_LINE_SIZE);\n+\tend_elem = RTE_PTR_ALIGN_FLOOR(end_elem, RTE_CACHE_LINE_SIZE);\n \n \tconst unsigned elem_size = (uintptr_t)end_elem - (uintptr_t)start_elem;\n \tmalloc_elem_init(start_elem, heap, mz, elem_size);\ndiff --git a/lib/librte_mempool/rte_mempool.c b/lib/librte_mempool/rte_mempool.c\nindex 332f469..bb09dae 100644\n--- a/lib/librte_mempool/rte_mempool.c\n+++ b/lib/librte_mempool/rte_mempool.c\n@@ -114,10 +114,10 @@ static unsigned optimize_object_size(unsigned obj_size)\n \t\tnrank = 1;\n \n \t/* process new object size */\n-\tnew_obj_size = (obj_size + CACHE_LINE_MASK) / CACHE_LINE_SIZE;\n+\tnew_obj_size = (obj_size + CACHE_LINE_MASK) / RTE_CACHE_LINE_SIZE;\n \twhile (get_gcd(new_obj_size, nrank * nchan) != 1)\n \t\tnew_obj_size++;\n-\treturn new_obj_size * CACHE_LINE_SIZE;\n+\treturn new_obj_size * RTE_CACHE_LINE_SIZE;\n }\n \n static void\n@@ -255,7 +255,7 @@ rte_mempool_calc_obj_size(uint32_t elt_size, uint32_t flags,\n #endif\n \tif ((flags & MEMPOOL_F_NO_CACHE_ALIGN) == 0)\n \t\tsz->header_size = RTE_ALIGN_CEIL(sz->header_size,\n-\t\t\tCACHE_LINE_SIZE);\n+\t\t\tRTE_CACHE_LINE_SIZE);\n \n \t/* trailer contains the cookie in debug mode */\n \tsz->trailer_size = 0;\n@@ -269,7 +269,7 @@ rte_mempool_calc_obj_size(uint32_t elt_size, uint32_t flags,\n \tif ((flags & MEMPOOL_F_NO_CACHE_ALIGN) == 0) {\n \t\tsz->total_size = sz->header_size + sz->elt_size +\n \t\t\tsz->trailer_size;\n-\t\tsz->trailer_size += ((CACHE_LINE_SIZE -\n+\t\tsz->trailer_size += ((RTE_CACHE_LINE_SIZE -\n \t\t\t\t  (sz->total_size & CACHE_LINE_MASK)) &\n \t\t\t\t CACHE_LINE_MASK);\n \t}\ndiff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h\nindex 7b641b0..3314651 100644\n--- a/lib/librte_mempool/rte_mempool.h\n+++ b/lib/librte_mempool/rte_mempool.h\n@@ -216,7 +216,7 @@ struct rte_mempool {\n  */\n #define\tMEMPOOL_HEADER_SIZE(mp, pgn)\t(sizeof(*(mp)) + \\\n \tRTE_ALIGN_CEIL(((pgn) - RTE_DIM((mp)->elt_pa)) * \\\n-\tsizeof ((mp)->elt_pa[0]), CACHE_LINE_SIZE))\n+\tsizeof ((mp)->elt_pa[0]), RTE_CACHE_LINE_SIZE))\n \n /**\n  * Returns TRUE if whole mempool is allocated in one contiguous block of memory.\ndiff --git a/lib/librte_pipeline/rte_pipeline.c b/lib/librte_pipeline/rte_pipeline.c\nindex f0349e3..ac7e887 100644\n--- a/lib/librte_pipeline/rte_pipeline.c\n+++ b/lib/librte_pipeline/rte_pipeline.c\n@@ -203,7 +203,7 @@ rte_pipeline_create(struct rte_pipeline_params *params)\n \n \t/* Allocate memory for the pipeline on requested socket */\n \tp = rte_zmalloc_socket(\"PIPELINE\", sizeof(struct rte_pipeline),\n-\t\t\tCACHE_LINE_SIZE, params->socket_id);\n+\t\t\tRTE_CACHE_LINE_SIZE, params->socket_id);\n \n \tif (p == NULL) {\n \t\tRTE_LOG(ERR, PIPELINE,\n@@ -343,7 +343,7 @@ rte_pipeline_table_create(struct rte_pipeline *p,\n \tentry_size = sizeof(struct rte_pipeline_table_entry) +\n \t\tparams->action_data_size;\n \tdefault_entry = (struct rte_pipeline_table_entry *) rte_zmalloc_socket(\n-\t\t\"PIPELINE\", entry_size, CACHE_LINE_SIZE, p->socket_id);\n+\t\t\"PIPELINE\", entry_size, RTE_CACHE_LINE_SIZE, p->socket_id);\n \tif (default_entry == NULL) {\n \t\tRTE_LOG(ERR, PIPELINE,\n \t\t\t\"%s: Failed to allocate default entry\\n\", __func__);\ndiff --git a/lib/librte_pmd_e1000/em_rxtx.c b/lib/librte_pmd_e1000/em_rxtx.c\nindex 70d398f..aa0b88c 100644\n--- a/lib/librte_pmd_e1000/em_rxtx.c\n+++ b/lib/librte_pmd_e1000/em_rxtx.c\n@@ -1120,7 +1120,7 @@ ring_dma_zone_reserve(struct rte_eth_dev *dev, const char *ring_name,\n \n #ifdef RTE_LIBRTE_XEN_DOM0\n \treturn rte_memzone_reserve_bounded(z_name, ring_size,\n-\t\t\tsocket_id, 0, CACHE_LINE_SIZE, RTE_PGSIZE_2M);\n+\t\t\tsocket_id, 0, RTE_CACHE_LINE_SIZE, RTE_PGSIZE_2M);\n #else\n \treturn rte_memzone_reserve(z_name, ring_size, socket_id, 0);\n #endif\n@@ -1279,13 +1279,13 @@ eth_em_tx_queue_setup(struct rte_eth_dev *dev,\n \n \t/* Allocate the tx queue data structure. */\n \tif ((txq = rte_zmalloc(\"ethdev TX queue\", sizeof(*txq),\n-\t\t\tCACHE_LINE_SIZE)) == NULL)\n+\t\t\tRTE_CACHE_LINE_SIZE)) == NULL)\n \t\treturn (-ENOMEM);\n \n \t/* Allocate software ring */\n \tif ((txq->sw_ring = rte_zmalloc(\"txq->sw_ring\",\n \t\t\tsizeof(txq->sw_ring[0]) * nb_desc,\n-\t\t\tCACHE_LINE_SIZE)) == NULL) {\n+\t\t\tRTE_CACHE_LINE_SIZE)) == NULL) {\n \t\tem_tx_queue_release(txq);\n \t\treturn (-ENOMEM);\n \t}\n@@ -1406,13 +1406,13 @@ eth_em_rx_queue_setup(struct rte_eth_dev *dev,\n \n \t/* Allocate the RX queue data structure. */\n \tif ((rxq = rte_zmalloc(\"ethdev RX queue\", sizeof(*rxq),\n-\t\t\tCACHE_LINE_SIZE)) == NULL)\n+\t\t\tRTE_CACHE_LINE_SIZE)) == NULL)\n \t\treturn (-ENOMEM);\n \n \t/* Allocate software ring. */\n \tif ((rxq->sw_ring = rte_zmalloc(\"rxq->sw_ring\",\n \t\t\tsizeof (rxq->sw_ring[0]) * nb_desc,\n-\t\t\tCACHE_LINE_SIZE)) == NULL) {\n+\t\t\tRTE_CACHE_LINE_SIZE)) == NULL) {\n \t\tem_rx_queue_release(rxq);\n \t\treturn (-ENOMEM);\n \t}\ndiff --git a/lib/librte_pmd_e1000/igb_rxtx.c b/lib/librte_pmd_e1000/igb_rxtx.c\nindex 0dca7b7..bc2999c 100644\n--- a/lib/librte_pmd_e1000/igb_rxtx.c\n+++ b/lib/librte_pmd_e1000/igb_rxtx.c\n@@ -1240,7 +1240,7 @@ eth_igb_tx_queue_setup(struct rte_eth_dev *dev,\n \n \t/* First allocate the tx queue data structure */\n \ttxq = rte_zmalloc(\"ethdev TX queue\", sizeof(struct igb_tx_queue),\n-\t\t\t\t\t\t\tCACHE_LINE_SIZE);\n+\t\t\t\t\t\t\tRTE_CACHE_LINE_SIZE);\n \tif (txq == NULL)\n \t\treturn (-ENOMEM);\n \n@@ -1278,7 +1278,7 @@ eth_igb_tx_queue_setup(struct rte_eth_dev *dev,\n \t/* Allocate software ring */\n \ttxq->sw_ring = rte_zmalloc(\"txq->sw_ring\",\n \t\t\t\t   sizeof(struct igb_tx_entry) * nb_desc,\n-\t\t\t\t   CACHE_LINE_SIZE);\n+\t\t\t\t   RTE_CACHE_LINE_SIZE);\n \tif (txq->sw_ring == NULL) {\n \t\tigb_tx_queue_release(txq);\n \t\treturn (-ENOMEM);\n@@ -1374,7 +1374,7 @@ eth_igb_rx_queue_setup(struct rte_eth_dev *dev,\n \n \t/* First allocate the RX queue data structure. */\n \trxq = rte_zmalloc(\"ethdev RX queue\", sizeof(struct igb_rx_queue),\n-\t\t\t  CACHE_LINE_SIZE);\n+\t\t\t  RTE_CACHE_LINE_SIZE);\n \tif (rxq == NULL)\n \t\treturn (-ENOMEM);\n \trxq->mb_pool = mp;\n@@ -1416,7 +1416,7 @@ eth_igb_rx_queue_setup(struct rte_eth_dev *dev,\n \t/* Allocate software ring. */\n \trxq->sw_ring = rte_zmalloc(\"rxq->sw_ring\",\n \t\t\t\t   sizeof(struct igb_rx_entry) * nb_desc,\n-\t\t\t\t   CACHE_LINE_SIZE);\n+\t\t\t\t   RTE_CACHE_LINE_SIZE);\n \tif (rxq->sw_ring == NULL) {\n \t\tigb_rx_queue_release(rxq);\n \t\treturn (-ENOMEM);\ndiff --git a/lib/librte_pmd_i40e/i40e_rxtx.c b/lib/librte_pmd_i40e/i40e_rxtx.c\nindex 487591d..0cd8c98 100644\n--- a/lib/librte_pmd_i40e/i40e_rxtx.c\n+++ b/lib/librte_pmd_i40e/i40e_rxtx.c\n@@ -1697,7 +1697,7 @@ i40e_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \t/* Allocate the rx queue data structure */\n \trxq = rte_zmalloc_socket(\"i40e rx queue\",\n \t\t\t\t sizeof(struct i40e_rx_queue),\n-\t\t\t\t CACHE_LINE_SIZE,\n+\t\t\t\t RTE_CACHE_LINE_SIZE,\n \t\t\t\t socket_id);\n \tif (!rxq) {\n \t\tPMD_DRV_LOG(ERR, \"Failed to allocate memory for \"\n@@ -1756,7 +1756,7 @@ i40e_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \trxq->sw_ring =\n \t\trte_zmalloc_socket(\"i40e rx sw ring\",\n \t\t\t\t   sizeof(struct i40e_rx_entry) * len,\n-\t\t\t\t   CACHE_LINE_SIZE,\n+\t\t\t\t   RTE_CACHE_LINE_SIZE,\n \t\t\t\t   socket_id);\n \tif (!rxq->sw_ring) {\n \t\ti40e_dev_rx_queue_release(rxq);\n@@ -1981,7 +1981,7 @@ i40e_dev_tx_queue_setup(struct rte_eth_dev *dev,\n \t/* Allocate the TX queue data structure. */\n \ttxq = rte_zmalloc_socket(\"i40e tx queue\",\n \t\t\t\t  sizeof(struct i40e_tx_queue),\n-\t\t\t\t  CACHE_LINE_SIZE,\n+\t\t\t\t  RTE_CACHE_LINE_SIZE,\n \t\t\t\t  socket_id);\n \tif (!txq) {\n \t\tPMD_DRV_LOG(ERR, \"Failed to allocate memory for \"\n@@ -2032,7 +2032,7 @@ i40e_dev_tx_queue_setup(struct rte_eth_dev *dev,\n \ttxq->sw_ring =\n \t\trte_zmalloc_socket(\"i40e tx sw ring\",\n \t\t\t\t   sizeof(struct i40e_tx_entry) * nb_desc,\n-\t\t\t\t   CACHE_LINE_SIZE,\n+\t\t\t\t   RTE_CACHE_LINE_SIZE,\n \t\t\t\t   socket_id);\n \tif (!txq->sw_ring) {\n \t\ti40e_dev_tx_queue_release(txq);\ndiff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c\nindex f9b3fe3..0b6f2c7 100644\n--- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c\n+++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c\n@@ -1825,7 +1825,7 @@ ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,\n \n \t/* First allocate the tx queue data structure */\n \ttxq = rte_zmalloc_socket(\"ethdev TX queue\", sizeof(struct igb_tx_queue),\n-\t\t\t\t CACHE_LINE_SIZE, socket_id);\n+\t\t\t\t RTE_CACHE_LINE_SIZE, socket_id);\n \tif (txq == NULL)\n \t\treturn (-ENOMEM);\n \n@@ -1873,7 +1873,7 @@ ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,\n \t/* Allocate software ring */\n \ttxq->sw_ring = rte_zmalloc_socket(\"txq->sw_ring\",\n \t\t\t\tsizeof(struct igb_tx_entry) * nb_desc,\n-\t\t\t\tCACHE_LINE_SIZE, socket_id);\n+\t\t\t\tRTE_CACHE_LINE_SIZE, socket_id);\n \tif (txq->sw_ring == NULL) {\n \t\tixgbe_tx_queue_release(txq);\n \t\treturn (-ENOMEM);\n@@ -2111,7 +2111,7 @@ ixgbe_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \n \t/* First allocate the rx queue data structure */\n \trxq = rte_zmalloc_socket(\"ethdev RX queue\", sizeof(struct igb_rx_queue),\n-\t\t\t\t CACHE_LINE_SIZE, socket_id);\n+\t\t\t\t RTE_CACHE_LINE_SIZE, socket_id);\n \tif (rxq == NULL)\n \t\treturn (-ENOMEM);\n \trxq->mb_pool = mp;\n@@ -2177,7 +2177,7 @@ ixgbe_dev_rx_queue_setup(struct rte_eth_dev *dev,\n #endif\n \trxq->sw_ring = rte_zmalloc_socket(\"rxq->sw_ring\",\n \t\t\t\t\t  sizeof(struct igb_rx_entry) * len,\n-\t\t\t\t\t  CACHE_LINE_SIZE, socket_id);\n+\t\t\t\t\t  RTE_CACHE_LINE_SIZE, socket_id);\n \tif (rxq->sw_ring == NULL) {\n \t\tixgbe_rx_queue_release(rxq);\n \t\treturn (-ENOMEM);\ndiff --git a/lib/librte_pmd_virtio/virtio_ethdev.c b/lib/librte_pmd_virtio/virtio_ethdev.c\nindex c009f2a..b3b5bb6 100644\n--- a/lib/librte_pmd_virtio/virtio_ethdev.c\n+++ b/lib/librte_pmd_virtio/virtio_ethdev.c\n@@ -274,18 +274,18 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,\n \t\tsnprintf(vq_name, sizeof(vq_name), \"port%d_rvq%d\",\n \t\t\tdev->data->port_id, queue_idx);\n \t\tvq = rte_zmalloc(vq_name, sizeof(struct virtqueue) +\n-\t\t\tvq_size * sizeof(struct vq_desc_extra), CACHE_LINE_SIZE);\n+\t\t\tvq_size * sizeof(struct vq_desc_extra), RTE_CACHE_LINE_SIZE);\n \t} else if (queue_type == VTNET_TQ) {\n \t\tsnprintf(vq_name, sizeof(vq_name), \"port%d_tvq%d\",\n \t\t\tdev->data->port_id, queue_idx);\n \t\tvq = rte_zmalloc(vq_name, sizeof(struct virtqueue) +\n-\t\t\tvq_size * sizeof(struct vq_desc_extra), CACHE_LINE_SIZE);\n+\t\t\tvq_size * sizeof(struct vq_desc_extra), RTE_CACHE_LINE_SIZE);\n \t} else if (queue_type == VTNET_CQ) {\n \t\tsnprintf(vq_name, sizeof(vq_name), \"port%d_cvq\",\n \t\t\tdev->data->port_id);\n \t\tvq = rte_zmalloc(vq_name, sizeof(struct virtqueue) +\n \t\t\tvq_size * sizeof(struct vq_desc_extra),\n-\t\t\tCACHE_LINE_SIZE);\n+\t\t\tRTE_CACHE_LINE_SIZE);\n \t}\n \tif (vq == NULL) {\n \t\tPMD_INIT_LOG(ERR, \"%s: Can not allocate virtqueue\", __func__);\n@@ -342,7 +342,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,\n \t\t\tdev->data->port_id, queue_idx);\n \t\tvq->virtio_net_hdr_mz = rte_memzone_reserve_aligned(vq_name,\n \t\t\tvq_size * hw->vtnet_hdr_size,\n-\t\t\tsocket_id, 0, CACHE_LINE_SIZE);\n+\t\t\tsocket_id, 0, RTE_CACHE_LINE_SIZE);\n \t\tif (vq->virtio_net_hdr_mz == NULL) {\n \t\t\trte_free(vq);\n \t\t\treturn -ENOMEM;\n@@ -356,7 +356,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,\n \t\tsnprintf(vq_name, sizeof(vq_name), \"port%d_cvq_hdrzone\",\n \t\t\tdev->data->port_id);\n \t\tvq->virtio_net_hdr_mz = rte_memzone_reserve_aligned(vq_name,\n-\t\t\tPAGE_SIZE, socket_id, 0, CACHE_LINE_SIZE);\n+\t\t\tPAGE_SIZE, socket_id, 0, RTE_CACHE_LINE_SIZE);\n \t\tif (vq->virtio_net_hdr_mz == NULL) {\n \t\t\trte_free(vq);\n \t\t\treturn -ENOMEM;\ndiff --git a/lib/librte_pmd_virtio/virtio_rxtx.c b/lib/librte_pmd_virtio/virtio_rxtx.c\nindex 3f6bad2..c013f97 100644\n--- a/lib/librte_pmd_virtio/virtio_rxtx.c\n+++ b/lib/librte_pmd_virtio/virtio_rxtx.c\n@@ -441,7 +441,7 @@ virtio_discard_rxbuf(struct virtqueue *vq, struct rte_mbuf *m)\n }\n \n #define VIRTIO_MBUF_BURST_SZ 64\n-#define DESC_PER_CACHELINE (CACHE_LINE_SIZE / sizeof(struct vring_desc))\n+#define DESC_PER_CACHELINE (RTE_CACHE_LINE_SIZE / sizeof(struct vring_desc))\n uint16_t\n virtio_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n {\ndiff --git a/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c b/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c\nindex 64789ac..963a8a5 100644\n--- a/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c\n+++ b/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c\n@@ -347,7 +347,7 @@ vmxnet3_dev_configure(struct rte_eth_dev *dev)\n \n \t\t/* Allocate memory structure for UPT1_RSSConf and configure */\n \t\tmz = gpa_zone_reserve(dev, sizeof(struct VMXNET3_RSSConf), \"rss_conf\",\n-\t\t\t\t      rte_socket_id(), CACHE_LINE_SIZE);\n+\t\t\t\t      rte_socket_id(), RTE_CACHE_LINE_SIZE);\n \t\tif (mz == NULL) {\n \t\t\tPMD_INIT_LOG(ERR,\n \t\t\t\t     \"ERROR: Creating rss_conf structure zone\");\ndiff --git a/lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c b/lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c\nindex 6c69f84..8425f32 100644\n--- a/lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c\n+++ b/lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c\n@@ -744,7 +744,7 @@ vmxnet3_dev_tx_queue_setup(struct rte_eth_dev *dev,\n \t\treturn -EINVAL;\n \t}\n \n-\ttxq = rte_zmalloc(\"ethdev_tx_queue\", sizeof(struct vmxnet3_tx_queue), CACHE_LINE_SIZE);\n+\ttxq = rte_zmalloc(\"ethdev_tx_queue\", sizeof(struct vmxnet3_tx_queue), RTE_CACHE_LINE_SIZE);\n \tif (txq == NULL) {\n \t\tPMD_INIT_LOG(ERR, \"Can not allocate tx queue structure\");\n \t\treturn -ENOMEM;\n@@ -810,7 +810,7 @@ vmxnet3_dev_tx_queue_setup(struct rte_eth_dev *dev,\n \n \t/* cmd_ring0 buf_info allocation */\n \tring->buf_info = rte_zmalloc(\"tx_ring_buf_info\",\n-\t\t\t\t     ring->size * sizeof(vmxnet3_buf_info_t), CACHE_LINE_SIZE);\n+\t\t\t\t     ring->size * sizeof(vmxnet3_buf_info_t), RTE_CACHE_LINE_SIZE);\n \tif (ring->buf_info == NULL) {\n \t\tPMD_INIT_LOG(ERR, \"ERROR: Creating tx_buf_info structure\");\n \t\treturn -ENOMEM;\n@@ -855,7 +855,7 @@ vmxnet3_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \t\treturn -EINVAL;\n \t}\n \n-\trxq = rte_zmalloc(\"ethdev_rx_queue\", sizeof(struct vmxnet3_rx_queue), CACHE_LINE_SIZE);\n+\trxq = rte_zmalloc(\"ethdev_rx_queue\", sizeof(struct vmxnet3_rx_queue), RTE_CACHE_LINE_SIZE);\n \tif (rxq == NULL) {\n \t\tPMD_INIT_LOG(ERR, \"Can not allocate rx queue structure\");\n \t\treturn -ENOMEM;\n@@ -929,7 +929,7 @@ vmxnet3_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \t\tring->rid = i;\n \t\tsnprintf(mem_name, sizeof(mem_name), \"rx_ring_%d_buf_info\", i);\n \n-\t\tring->buf_info = rte_zmalloc(mem_name, ring->size * sizeof(vmxnet3_buf_info_t), CACHE_LINE_SIZE);\n+\t\tring->buf_info = rte_zmalloc(mem_name, ring->size * sizeof(vmxnet3_buf_info_t), RTE_CACHE_LINE_SIZE);\n \t\tif (ring->buf_info == NULL) {\n \t\t\tPMD_INIT_LOG(ERR, \"ERROR: Creating rx_buf_info structure\");\n \t\t\treturn -ENOMEM;\ndiff --git a/lib/librte_pmd_xenvirt/rte_eth_xenvirt.c b/lib/librte_pmd_xenvirt/rte_eth_xenvirt.c\nindex 891cb58..6555ec5 100644\n--- a/lib/librte_pmd_xenvirt/rte_eth_xenvirt.c\n+++ b/lib/librte_pmd_xenvirt/rte_eth_xenvirt.c\n@@ -452,7 +452,7 @@ virtio_queue_setup(struct rte_eth_dev *dev, int queue_type)\n \t\tsnprintf(vq_name, sizeof(vq_name), \"port%d_rvq\",\n \t\t\t\tdev->data->port_id);\n \t\tvq = rte_zmalloc(vq_name, sizeof(struct virtqueue) +\n-\t\t\tvq_size * sizeof(struct vq_desc_extra), CACHE_LINE_SIZE);\n+\t\t\tvq_size * sizeof(struct vq_desc_extra), RTE_CACHE_LINE_SIZE);\n \t\tif (vq == NULL) {\n \t\t\tRTE_LOG(ERR, PMD, \"%s: unabled to allocate virtqueue\\n\", __func__);\n \t\t\treturn NULL;\n@@ -462,7 +462,7 @@ virtio_queue_setup(struct rte_eth_dev *dev, int queue_type)\n \t\tsnprintf(vq_name, sizeof(vq_name), \"port%d_tvq\",\n \t\t\tdev->data->port_id);\n \t\tvq = rte_zmalloc(vq_name, sizeof(struct virtqueue) +\n-\t\t\tvq_size * sizeof(struct vq_desc_extra), CACHE_LINE_SIZE);\n+\t\t\tvq_size * sizeof(struct vq_desc_extra), RTE_CACHE_LINE_SIZE);\n \t\tif (vq == NULL) {\n \t\t\tRTE_LOG(ERR, PMD, \"%s: unabled to allocate virtqueue\\n\", __func__);\n \t\t\treturn NULL;\n@@ -556,7 +556,7 @@ rte_eth_xenvirt_parse_args(struct xenvirt_dict *dict,\n \tif (params == NULL)\n \t\treturn 0;\n \n-\targs = rte_zmalloc(NULL, strlen(params) + 1, CACHE_LINE_SIZE);\n+\targs = rte_zmalloc(NULL, strlen(params) + 1, RTE_CACHE_LINE_SIZE);\n \tif (args == NULL) {\n \t\tRTE_LOG(ERR, PMD, \"Couldn't parse %s device \\n\", name);\n \t\treturn -1;\ndiff --git a/lib/librte_port/rte_port_ethdev.c b/lib/librte_port/rte_port_ethdev.c\nindex 2d6f279..d014913 100644\n--- a/lib/librte_port/rte_port_ethdev.c\n+++ b/lib/librte_port/rte_port_ethdev.c\n@@ -61,7 +61,7 @@ rte_port_ethdev_reader_create(void *params, int socket_id)\n \n \t/* Memory allocation */\n \tport = rte_zmalloc_socket(\"PORT\", sizeof(*port),\n-\t\t\tCACHE_LINE_SIZE, socket_id);\n+\t\t\tRTE_CACHE_LINE_SIZE, socket_id);\n \tif (port == NULL) {\n \t\tRTE_LOG(ERR, PORT, \"%s: Failed to allocate port\\n\", __func__);\n \t\treturn NULL;\n@@ -128,7 +128,7 @@ rte_port_ethdev_writer_create(void *params, int socket_id)\n \n \t/* Memory allocation */\n \tport = rte_zmalloc_socket(\"PORT\", sizeof(*port),\n-\t\t\tCACHE_LINE_SIZE, socket_id);\n+\t\t\tRTE_CACHE_LINE_SIZE, socket_id);\n \tif (port == NULL) {\n \t\tRTE_LOG(ERR, PORT, \"%s: Failed to allocate port\\n\", __func__);\n \t\treturn NULL;\ndiff --git a/lib/librte_port/rte_port_frag.c b/lib/librte_port/rte_port_frag.c\nindex 9f1bd3c..57d930b 100644\n--- a/lib/librte_port/rte_port_frag.c\n+++ b/lib/librte_port/rte_port_frag.c\n@@ -93,7 +93,7 @@ rte_port_ring_reader_ipv4_frag_create(void *params, int socket_id)\n \t}\n \n \t/* Memory allocation */\n-\tport = rte_zmalloc_socket(\"PORT\", sizeof(*port), CACHE_LINE_SIZE,\n+\tport = rte_zmalloc_socket(\"PORT\", sizeof(*port), RTE_CACHE_LINE_SIZE,\n \t\tsocket_id);\n \tif (port == NULL) {\n \t\tRTE_LOG(ERR, PORT, \"%s: port is NULL\\n\", __func__);\ndiff --git a/lib/librte_port/rte_port_ras.c b/lib/librte_port/rte_port_ras.c\nindex b1ac297..b6ab67a 100644\n--- a/lib/librte_port/rte_port_ras.c\n+++ b/lib/librte_port/rte_port_ras.c\n@@ -86,7 +86,7 @@ rte_port_ring_writer_ipv4_ras_create(void *params, int socket_id)\n \n \t/* Memory allocation */\n \tport = rte_zmalloc_socket(\"PORT\", sizeof(*port),\n-\t\t\tCACHE_LINE_SIZE, socket_id);\n+\t\t\tRTE_CACHE_LINE_SIZE, socket_id);\n \tif (port == NULL) {\n \t\tRTE_LOG(ERR, PORT, \"%s: Failed to allocate socket\\n\", __func__);\n \t\treturn NULL;\ndiff --git a/lib/librte_port/rte_port_ring.c b/lib/librte_port/rte_port_ring.c\nindex 85bab63..fa3d77b 100644\n--- a/lib/librte_port/rte_port_ring.c\n+++ b/lib/librte_port/rte_port_ring.c\n@@ -60,7 +60,7 @@ rte_port_ring_reader_create(void *params, int socket_id)\n \n \t/* Memory allocation */\n \tport = rte_zmalloc_socket(\"PORT\", sizeof(*port),\n-\t\t\tCACHE_LINE_SIZE, socket_id);\n+\t\t\tRTE_CACHE_LINE_SIZE, socket_id);\n \tif (port == NULL) {\n \t\tRTE_LOG(ERR, PORT, \"%s: Failed to allocate port\\n\", __func__);\n \t\treturn NULL;\n@@ -120,7 +120,7 @@ rte_port_ring_writer_create(void *params, int socket_id)\n \n \t/* Memory allocation */\n \tport = rte_zmalloc_socket(\"PORT\", sizeof(*port),\n-\t\t\tCACHE_LINE_SIZE, socket_id);\n+\t\t\tRTE_CACHE_LINE_SIZE, socket_id);\n \tif (port == NULL) {\n \t\tRTE_LOG(ERR, PORT, \"%s: Failed to allocate port\\n\", __func__);\n \t\treturn NULL;\ndiff --git a/lib/librte_port/rte_port_sched.c b/lib/librte_port/rte_port_sched.c\nindex 0e71494..2107f4c 100644\n--- a/lib/librte_port/rte_port_sched.c\n+++ b/lib/librte_port/rte_port_sched.c\n@@ -60,7 +60,7 @@ rte_port_sched_reader_create(void *params, int socket_id)\n \n \t/* Memory allocation */\n \tport = rte_zmalloc_socket(\"PORT\", sizeof(*port),\n-\t\t\tCACHE_LINE_SIZE, socket_id);\n+\t\t\tRTE_CACHE_LINE_SIZE, socket_id);\n \tif (port == NULL) {\n \t\tRTE_LOG(ERR, PORT, \"%s: Failed to allocate port\\n\", __func__);\n \t\treturn NULL;\n@@ -123,7 +123,7 @@ rte_port_sched_writer_create(void *params, int socket_id)\n \n \t/* Memory allocation */\n \tport = rte_zmalloc_socket(\"PORT\", sizeof(*port),\n-\t\t\tCACHE_LINE_SIZE, socket_id);\n+\t\t\tRTE_CACHE_LINE_SIZE, socket_id);\n \tif (port == NULL) {\n \t\tRTE_LOG(ERR, PORT, \"%s: Failed to allocate port\\n\", __func__);\n \t\treturn NULL;\ndiff --git a/lib/librte_port/rte_port_source_sink.c b/lib/librte_port/rte_port_source_sink.c\nindex 23e3878..b9a25bb 100644\n--- a/lib/librte_port/rte_port_source_sink.c\n+++ b/lib/librte_port/rte_port_source_sink.c\n@@ -61,7 +61,7 @@ rte_port_source_create(void *params, int socket_id)\n \n \t/* Memory allocation */\n \tport = rte_zmalloc_socket(\"PORT\", sizeof(*port),\n-\t\t\tCACHE_LINE_SIZE, socket_id);\n+\t\t\tRTE_CACHE_LINE_SIZE, socket_id);\n \tif (port == NULL) {\n \t\tRTE_LOG(ERR, PORT, \"%s: Failed to allocate port\\n\", __func__);\n \t\treturn NULL;\ndiff --git a/lib/librte_ring/rte_ring.c b/lib/librte_ring/rte_ring.c\nindex b9ddccc..e007b0f 100644\n--- a/lib/librte_ring/rte_ring.c\n+++ b/lib/librte_ring/rte_ring.c\n@@ -110,7 +110,7 @@ rte_ring_get_memsize(unsigned count)\n \t}\n \n \tsz = sizeof(struct rte_ring) + count * sizeof(void *);\n-\tsz = RTE_ALIGN(sz, CACHE_LINE_SIZE);\n+\tsz = RTE_ALIGN(sz, RTE_CACHE_LINE_SIZE);\n \treturn sz;\n }\n \ndiff --git a/lib/librte_sched/rte_bitmap.h b/lib/librte_sched/rte_bitmap.h\nindex 89ed7fb..43d1d43 100644\n--- a/lib/librte_sched/rte_bitmap.h\n+++ b/lib/librte_sched/rte_bitmap.h\n@@ -83,7 +83,7 @@ extern \"C\" {\n #define RTE_BITMAP_SLAB_BIT_MASK                 (RTE_BITMAP_SLAB_BIT_SIZE - 1)\n \n /* Cache line (CL) */\n-#define RTE_BITMAP_CL_BIT_SIZE                   (CACHE_LINE_SIZE * 8)\n+#define RTE_BITMAP_CL_BIT_SIZE                   (RTE_CACHE_LINE_SIZE * 8)\n #define RTE_BITMAP_CL_BIT_SIZE_LOG2              9\n #define RTE_BITMAP_CL_BIT_MASK                   (RTE_BITMAP_CL_BIT_SIZE - 1)\n \n@@ -178,7 +178,7 @@ __rte_bitmap_get_memory_footprint(uint32_t n_bits,\n \tn_slabs_array1 = rte_align32pow2(n_slabs_array1);\n \tn_slabs_context = (sizeof(struct rte_bitmap) + (RTE_BITMAP_SLAB_BIT_SIZE / 8) - 1) / (RTE_BITMAP_SLAB_BIT_SIZE / 8);\n \tn_cache_lines_context_and_array1 = (n_slabs_context + n_slabs_array1 + RTE_BITMAP_CL_SLAB_SIZE - 1) / RTE_BITMAP_CL_SLAB_SIZE;\n-\tn_bytes_total = (n_cache_lines_context_and_array1 + n_cache_lines_array2) * CACHE_LINE_SIZE;\n+\tn_bytes_total = (n_cache_lines_context_and_array1 + n_cache_lines_array2) * RTE_CACHE_LINE_SIZE;\n \n \tif (array1_byte_offset) {\n \t\t*array1_byte_offset = n_slabs_context * (RTE_BITMAP_SLAB_BIT_SIZE / 8);\n@@ -187,7 +187,7 @@ __rte_bitmap_get_memory_footprint(uint32_t n_bits,\n \t\t*array1_slabs = n_slabs_array1;\n \t}\n \tif (array2_byte_offset) {\n-\t\t*array2_byte_offset = n_cache_lines_context_and_array1 * CACHE_LINE_SIZE;\n+\t\t*array2_byte_offset = n_cache_lines_context_and_array1 * RTE_CACHE_LINE_SIZE;\n \t}\n \tif (array2_slabs) {\n \t\t*array2_slabs = n_cache_lines_array2 * RTE_BITMAP_CL_SLAB_SIZE;\ndiff --git a/lib/librte_sched/rte_sched.c b/lib/librte_sched/rte_sched.c\nindex ba60277..1447a27 100644\n--- a/lib/librte_sched/rte_sched.c\n+++ b/lib/librte_sched/rte_sched.c\n@@ -617,7 +617,7 @@ rte_sched_port_config(struct rte_sched_port_params *params)\n \t}\n \n \t/* Allocate memory to store the data structures */\n-\tport = rte_zmalloc(\"qos_params\", mem_size, CACHE_LINE_SIZE);\n+\tport = rte_zmalloc(\"qos_params\", mem_size, RTE_CACHE_LINE_SIZE);\n \tif (port == NULL) {\n \t\treturn NULL;\n \t}\ndiff --git a/lib/librte_table/rte_table_acl.c b/lib/librte_table/rte_table_acl.c\nindex c6d389e..ed0aae8 100644\n--- a/lib/librte_table/rte_table_acl.c\n+++ b/lib/librte_table/rte_table_acl.c\n@@ -75,7 +75,7 @@ rte_table_acl_create(\n \tuint32_t action_table_size, acl_rule_list_size, acl_rule_memory_size;\n \tuint32_t total_size;\n \n-\tRTE_BUILD_BUG_ON(((sizeof(struct rte_table_acl) % CACHE_LINE_SIZE)\n+\tRTE_BUILD_BUG_ON(((sizeof(struct rte_table_acl) % RTE_CACHE_LINE_SIZE)\n \t\t!= 0));\n \n \t/* Check input parameters */\n@@ -110,7 +110,7 @@ rte_table_acl_create(\n \ttotal_size = sizeof(struct rte_table_acl) + action_table_size +\n \t\tacl_rule_list_size + acl_rule_memory_size;\n \n-\tacl = rte_zmalloc_socket(\"TABLE\", total_size, CACHE_LINE_SIZE,\n+\tacl = rte_zmalloc_socket(\"TABLE\", total_size, RTE_CACHE_LINE_SIZE,\n \t\tsocket_id);\n \tif (acl == NULL) {\n \t\tRTE_LOG(ERR, TABLE,\ndiff --git a/lib/librte_table/rte_table_array.c b/lib/librte_table/rte_table_array.c\nindex f0f5e1e..0b1d42a 100644\n--- a/lib/librte_table/rte_table_array.c\n+++ b/lib/librte_table/rte_table_array.c\n@@ -72,11 +72,11 @@ rte_table_array_create(void *params, int socket_id, uint32_t entry_size)\n \n \t/* Memory allocation */\n \ttotal_cl_size = (sizeof(struct rte_table_array) +\n-\t\t\tCACHE_LINE_SIZE) / CACHE_LINE_SIZE;\n+\t\t\tRTE_CACHE_LINE_SIZE) / RTE_CACHE_LINE_SIZE;\n \ttotal_cl_size += (p->n_entries * entry_size +\n-\t\t\tCACHE_LINE_SIZE) / CACHE_LINE_SIZE;\n-\ttotal_size = total_cl_size * CACHE_LINE_SIZE;\n-\tt = rte_zmalloc_socket(\"TABLE\", total_size, CACHE_LINE_SIZE, socket_id);\n+\t\t\tRTE_CACHE_LINE_SIZE) / RTE_CACHE_LINE_SIZE;\n+\ttotal_size = total_cl_size * RTE_CACHE_LINE_SIZE;\n+\tt = rte_zmalloc_socket(\"TABLE\", total_size, RTE_CACHE_LINE_SIZE, socket_id);\n \tif (t == NULL) {\n \t\tRTE_LOG(ERR, TABLE,\n \t\t\t\"%s: Cannot allocate %u bytes for array table\\n\",\ndiff --git a/lib/librte_table/rte_table_hash_ext.c b/lib/librte_table/rte_table_hash_ext.c\nindex 6e26d98..638c2cd 100644\n--- a/lib/librte_table/rte_table_hash_ext.c\n+++ b/lib/librte_table/rte_table_hash_ext.c\n@@ -180,8 +180,8 @@ rte_table_hash_ext_create(void *params, int socket_id, uint32_t entry_size)\n \t/* Check input parameters */\n \tif ((check_params_create(p) != 0) ||\n \t\t(!rte_is_power_of_2(entry_size)) ||\n-\t\t((sizeof(struct rte_table_hash) % CACHE_LINE_SIZE) != 0) ||\n-\t\t(sizeof(struct bucket) != (CACHE_LINE_SIZE / 2)))\n+\t\t((sizeof(struct rte_table_hash) % RTE_CACHE_LINE_SIZE) != 0) ||\n+\t\t(sizeof(struct bucket) != (RTE_CACHE_LINE_SIZE / 2)))\n \t\treturn NULL;\n \n \t/* Memory allocation */\n@@ -197,7 +197,7 @@ rte_table_hash_ext_create(void *params, int socket_id, uint32_t entry_size)\n \ttotal_size = table_meta_sz + bucket_sz + bucket_ext_sz + key_sz +\n \t\tkey_stack_sz + bkt_ext_stack_sz + data_sz;\n \n-\tt = rte_zmalloc_socket(\"TABLE\", total_size, CACHE_LINE_SIZE, socket_id);\n+\tt = rte_zmalloc_socket(\"TABLE\", total_size, RTE_CACHE_LINE_SIZE, socket_id);\n \tif (t == NULL) {\n \t\tRTE_LOG(ERR, TABLE,\n \t\t\t\"%s: Cannot allocate %u bytes for hash table\\n\",\ndiff --git a/lib/librte_table/rte_table_hash_key16.c b/lib/librte_table/rte_table_hash_key16.c\nindex f5ec87d..a2887d5 100644\n--- a/lib/librte_table/rte_table_hash_key16.c\n+++ b/lib/librte_table/rte_table_hash_key16.c\n@@ -123,8 +123,8 @@ rte_table_hash_create_key16_lru(void *params,\n \n \t/* Check input parameters */\n \tif ((check_params_create_lru(p) != 0) ||\n-\t\t((sizeof(struct rte_table_hash) % CACHE_LINE_SIZE) != 0) ||\n-\t\t((sizeof(struct rte_bucket_4_16) % CACHE_LINE_SIZE) != 0))\n+\t\t((sizeof(struct rte_table_hash) % RTE_CACHE_LINE_SIZE) != 0) ||\n+\t\t((sizeof(struct rte_bucket_4_16) % RTE_CACHE_LINE_SIZE) != 0))\n \t\treturn NULL;\n \tn_entries_per_bucket = 4;\n \tkey_size = 16;\n@@ -133,11 +133,11 @@ rte_table_hash_create_key16_lru(void *params,\n \tn_buckets = rte_align32pow2((p->n_entries + n_entries_per_bucket - 1) /\n \t\tn_entries_per_bucket);\n \tbucket_size_cl = (sizeof(struct rte_bucket_4_16) + n_entries_per_bucket\n-\t\t* entry_size + CACHE_LINE_SIZE - 1) / CACHE_LINE_SIZE;\n+\t\t* entry_size + RTE_CACHE_LINE_SIZE - 1) / RTE_CACHE_LINE_SIZE;\n \ttotal_size = sizeof(struct rte_table_hash) + n_buckets *\n-\t\tbucket_size_cl * CACHE_LINE_SIZE;\n+\t\tbucket_size_cl * RTE_CACHE_LINE_SIZE;\n \n-\tf = rte_zmalloc_socket(\"TABLE\", total_size, CACHE_LINE_SIZE, socket_id);\n+\tf = rte_zmalloc_socket(\"TABLE\", total_size, RTE_CACHE_LINE_SIZE, socket_id);\n \tif (f == NULL) {\n \t\tRTE_LOG(ERR, TABLE,\n \t\t\"%s: Cannot allocate %u bytes for hash table\\n\",\n@@ -153,7 +153,7 @@ rte_table_hash_create_key16_lru(void *params,\n \tf->n_entries_per_bucket = n_entries_per_bucket;\n \tf->key_size = key_size;\n \tf->entry_size = entry_size;\n-\tf->bucket_size = bucket_size_cl * CACHE_LINE_SIZE;\n+\tf->bucket_size = bucket_size_cl * RTE_CACHE_LINE_SIZE;\n \tf->signature_offset = p->signature_offset;\n \tf->key_offset = p->key_offset;\n \tf->f_hash = p->f_hash;\n@@ -341,8 +341,8 @@ rte_table_hash_create_key16_ext(void *params,\n \n \t/* Check input parameters */\n \tif ((check_params_create_ext(p) != 0) ||\n-\t\t((sizeof(struct rte_table_hash) % CACHE_LINE_SIZE) != 0) ||\n-\t\t((sizeof(struct rte_bucket_4_16) % CACHE_LINE_SIZE) != 0))\n+\t\t((sizeof(struct rte_table_hash) % RTE_CACHE_LINE_SIZE) != 0) ||\n+\t\t((sizeof(struct rte_bucket_4_16) % RTE_CACHE_LINE_SIZE) != 0))\n \t\treturn NULL;\n \n \tn_entries_per_bucket = 4;\n@@ -354,14 +354,14 @@ rte_table_hash_create_key16_ext(void *params,\n \tn_buckets_ext = (p->n_entries_ext + n_entries_per_bucket - 1) /\n \t\tn_entries_per_bucket;\n \tbucket_size_cl = (sizeof(struct rte_bucket_4_16) + n_entries_per_bucket\n-\t\t* entry_size + CACHE_LINE_SIZE - 1) / CACHE_LINE_SIZE;\n-\tstack_size_cl = (n_buckets_ext * sizeof(uint32_t) + CACHE_LINE_SIZE - 1)\n-\t\t/ CACHE_LINE_SIZE;\n+\t\t* entry_size + RTE_CACHE_LINE_SIZE - 1) / RTE_CACHE_LINE_SIZE;\n+\tstack_size_cl = (n_buckets_ext * sizeof(uint32_t) + RTE_CACHE_LINE_SIZE - 1)\n+\t\t/ RTE_CACHE_LINE_SIZE;\n \ttotal_size = sizeof(struct rte_table_hash) +\n \t\t((n_buckets + n_buckets_ext) * bucket_size_cl + stack_size_cl) *\n-\t\tCACHE_LINE_SIZE;\n+\t\tRTE_CACHE_LINE_SIZE;\n \n-\tf = rte_zmalloc_socket(\"TABLE\", total_size, CACHE_LINE_SIZE, socket_id);\n+\tf = rte_zmalloc_socket(\"TABLE\", total_size, RTE_CACHE_LINE_SIZE, socket_id);\n \tif (f == NULL) {\n \t\tRTE_LOG(ERR, TABLE,\n \t\t\t\"%s: Cannot allocate %u bytes for hash table\\n\",\n@@ -377,7 +377,7 @@ rte_table_hash_create_key16_ext(void *params,\n \tf->n_entries_per_bucket = n_entries_per_bucket;\n \tf->key_size = key_size;\n \tf->entry_size = entry_size;\n-\tf->bucket_size = bucket_size_cl * CACHE_LINE_SIZE;\n+\tf->bucket_size = bucket_size_cl * RTE_CACHE_LINE_SIZE;\n \tf->signature_offset = p->signature_offset;\n \tf->key_offset = p->key_offset;\n \tf->f_hash = p->f_hash;\n@@ -608,7 +608,7 @@ rte_table_hash_entry_delete_key16_ext(\n \tbucket1 = (struct rte_bucket_4_16 *)\t\t\t\\\n \t\t&f->memory[bucket_index * f->bucket_size];\t\\\n \trte_prefetch0(bucket1);\t\t\t\t\t\\\n-\trte_prefetch0((void *)(((uintptr_t) bucket1) + CACHE_LINE_SIZE));\\\n+\trte_prefetch0((void *)(((uintptr_t) bucket1) + RTE_CACHE_LINE_SIZE));\\\n }\n \n #define lookup1_stage2_lru(pkt2_index, mbuf2, bucket2,\t\t\\\n@@ -684,7 +684,7 @@ rte_table_hash_entry_delete_key16_ext(\n \tbuckets_mask |= bucket_mask;\t\t\t\t\\\n \tbucket_next = bucket->next;\t\t\t\t\\\n \trte_prefetch0(bucket_next);\t\t\t\t\\\n-\trte_prefetch0((void *)(((uintptr_t) bucket_next) + CACHE_LINE_SIZE));\\\n+\trte_prefetch0((void *)(((uintptr_t) bucket_next) + RTE_CACHE_LINE_SIZE));\\\n \tbuckets[pkt_index] = bucket_next;\t\t\t\\\n \tkeys[pkt_index] = key;\t\t\t\t\t\\\n }\n@@ -741,14 +741,14 @@ rte_table_hash_entry_delete_key16_ext(\n \tbucket10 = (struct rte_bucket_4_16 *)\t\t\t\\\n \t\t&f->memory[bucket10_index * f->bucket_size];\t\\\n \trte_prefetch0(bucket10);\t\t\t\t\\\n-\trte_prefetch0((void *)(((uintptr_t) bucket10) + CACHE_LINE_SIZE));\\\n+\trte_prefetch0((void *)(((uintptr_t) bucket10) + RTE_CACHE_LINE_SIZE));\\\n \t\t\t\t\t\t\t\t\\\n \tsignature11 = RTE_MBUF_METADATA_UINT32(mbuf11, f->signature_offset);\\\n \tbucket11_index = signature11 & (f->n_buckets - 1);\t\\\n \tbucket11 = (struct rte_bucket_4_16 *)\t\t\t\\\n \t\t&f->memory[bucket11_index * f->bucket_size];\t\\\n \trte_prefetch0(bucket11);\t\t\t\t\\\n-\trte_prefetch0((void *)(((uintptr_t) bucket11) + CACHE_LINE_SIZE));\\\n+\trte_prefetch0((void *)(((uintptr_t) bucket11) + RTE_CACHE_LINE_SIZE));\\\n }\n \n #define lookup2_stage2_lru(pkt20_index, pkt21_index, mbuf20, mbuf21,\\\ndiff --git a/lib/librte_table/rte_table_hash_key32.c b/lib/librte_table/rte_table_hash_key32.c\nindex e8f4812..3d576d0 100644\n--- a/lib/librte_table/rte_table_hash_key32.c\n+++ b/lib/librte_table/rte_table_hash_key32.c\n@@ -123,8 +123,8 @@ rte_table_hash_create_key32_lru(void *params,\n \n \t/* Check input parameters */\n \tif ((check_params_create_lru(p) != 0) ||\n-\t\t((sizeof(struct rte_table_hash) % CACHE_LINE_SIZE) != 0) ||\n-\t\t((sizeof(struct rte_bucket_4_32) % CACHE_LINE_SIZE) != 0)) {\n+\t\t((sizeof(struct rte_table_hash) % RTE_CACHE_LINE_SIZE) != 0) ||\n+\t\t((sizeof(struct rte_bucket_4_32) % RTE_CACHE_LINE_SIZE) != 0)) {\n \t\treturn NULL;\n \t}\n \tn_entries_per_bucket = 4;\n@@ -134,11 +134,11 @@ rte_table_hash_create_key32_lru(void *params,\n \tn_buckets = rte_align32pow2((p->n_entries + n_entries_per_bucket - 1) /\n \t\tn_entries_per_bucket);\n \tbucket_size_cl = (sizeof(struct rte_bucket_4_32) + n_entries_per_bucket\n-\t\t* entry_size + CACHE_LINE_SIZE - 1) / CACHE_LINE_SIZE;\n+\t\t* entry_size + RTE_CACHE_LINE_SIZE - 1) / RTE_CACHE_LINE_SIZE;\n \ttotal_size = sizeof(struct rte_table_hash) + n_buckets *\n-\t\tbucket_size_cl * CACHE_LINE_SIZE;\n+\t\tbucket_size_cl * RTE_CACHE_LINE_SIZE;\n \n-\tf = rte_zmalloc_socket(\"TABLE\", total_size, CACHE_LINE_SIZE, socket_id);\n+\tf = rte_zmalloc_socket(\"TABLE\", total_size, RTE_CACHE_LINE_SIZE, socket_id);\n \tif (f == NULL) {\n \t\tRTE_LOG(ERR, TABLE,\n \t\t\t\"%s: Cannot allocate %u bytes for hash table\\n\",\n@@ -154,7 +154,7 @@ rte_table_hash_create_key32_lru(void *params,\n \tf->n_entries_per_bucket = n_entries_per_bucket;\n \tf->key_size = key_size;\n \tf->entry_size = entry_size;\n-\tf->bucket_size = bucket_size_cl * CACHE_LINE_SIZE;\n+\tf->bucket_size = bucket_size_cl * RTE_CACHE_LINE_SIZE;\n \tf->signature_offset = p->signature_offset;\n \tf->key_offset = p->key_offset;\n \tf->f_hash = p->f_hash;\n@@ -343,8 +343,8 @@ rte_table_hash_create_key32_ext(void *params,\n \n \t/* Check input parameters */\n \tif ((check_params_create_ext(p) != 0) ||\n-\t\t((sizeof(struct rte_table_hash) % CACHE_LINE_SIZE) != 0) ||\n-\t\t((sizeof(struct rte_bucket_4_32) % CACHE_LINE_SIZE) != 0))\n+\t\t((sizeof(struct rte_table_hash) % RTE_CACHE_LINE_SIZE) != 0) ||\n+\t\t((sizeof(struct rte_bucket_4_32) % RTE_CACHE_LINE_SIZE) != 0))\n \t\treturn NULL;\n \n \tn_entries_per_bucket = 4;\n@@ -356,14 +356,14 @@ rte_table_hash_create_key32_ext(void *params,\n \tn_buckets_ext = (p->n_entries_ext + n_entries_per_bucket - 1) /\n \t\tn_entries_per_bucket;\n \tbucket_size_cl = (sizeof(struct rte_bucket_4_32) + n_entries_per_bucket\n-\t\t* entry_size + CACHE_LINE_SIZE - 1) / CACHE_LINE_SIZE;\n-\tstack_size_cl = (n_buckets_ext * sizeof(uint32_t) + CACHE_LINE_SIZE - 1)\n-\t\t/ CACHE_LINE_SIZE;\n+\t\t* entry_size + RTE_CACHE_LINE_SIZE - 1) / RTE_CACHE_LINE_SIZE;\n+\tstack_size_cl = (n_buckets_ext * sizeof(uint32_t) + RTE_CACHE_LINE_SIZE - 1)\n+\t\t/ RTE_CACHE_LINE_SIZE;\n \ttotal_size = sizeof(struct rte_table_hash) +\n \t\t((n_buckets + n_buckets_ext) * bucket_size_cl + stack_size_cl) *\n-\t\tCACHE_LINE_SIZE;\n+\t\tRTE_CACHE_LINE_SIZE;\n \n-\tf = rte_zmalloc_socket(\"TABLE\", total_size, CACHE_LINE_SIZE, socket_id);\n+\tf = rte_zmalloc_socket(\"TABLE\", total_size, RTE_CACHE_LINE_SIZE, socket_id);\n \tif (f == NULL) {\n \t\tRTE_LOG(ERR, TABLE,\n \t\t\t\"%s: Cannot allocate %u bytes for hash table\\n\",\n@@ -379,7 +379,7 @@ rte_table_hash_create_key32_ext(void *params,\n \tf->n_entries_per_bucket = n_entries_per_bucket;\n \tf->key_size = key_size;\n \tf->entry_size = entry_size;\n-\tf->bucket_size = bucket_size_cl * CACHE_LINE_SIZE;\n+\tf->bucket_size = bucket_size_cl * RTE_CACHE_LINE_SIZE;\n \tf->signature_offset = p->signature_offset;\n \tf->key_offset = p->key_offset;\n \tf->f_hash = p->f_hash;\n@@ -621,8 +621,8 @@ rte_table_hash_entry_delete_key32_ext(\n \tbucket1 = (struct rte_bucket_4_32 *)\t\t\t\\\n \t\t&f->memory[bucket_index * f->bucket_size];\t\\\n \trte_prefetch0(bucket1);\t\t\t\t\t\\\n-\trte_prefetch0((void *)(((uintptr_t) bucket1) + CACHE_LINE_SIZE));\\\n-\trte_prefetch0((void *)(((uintptr_t) bucket1) + 2 * CACHE_LINE_SIZE));\\\n+\trte_prefetch0((void *)(((uintptr_t) bucket1) + RTE_CACHE_LINE_SIZE));\\\n+\trte_prefetch0((void *)(((uintptr_t) bucket1) + 2 * RTE_CACHE_LINE_SIZE));\\\n }\n \n #define lookup1_stage2_lru(pkt2_index, mbuf2, bucket2,\t\t\\\n@@ -698,9 +698,9 @@ rte_table_hash_entry_delete_key32_ext(\n \tbuckets_mask |= bucket_mask;\t\t\t\t\\\n \tbucket_next = bucket->next;\t\t\t\t\\\n \trte_prefetch0(bucket_next);\t\t\t\t\\\n-\trte_prefetch0((void *)(((uintptr_t) bucket_next) + CACHE_LINE_SIZE));\\\n+\trte_prefetch0((void *)(((uintptr_t) bucket_next) + RTE_CACHE_LINE_SIZE));\\\n \trte_prefetch0((void *)(((uintptr_t) bucket_next) +\t\\\n-\t\t2 * CACHE_LINE_SIZE));\t\t\t\t\\\n+\t\t2 * RTE_CACHE_LINE_SIZE));\t\t\t\t\\\n \tbuckets[pkt_index] = bucket_next;\t\t\t\\\n \tkeys[pkt_index] = key;\t\t\t\t\t\\\n }\n@@ -758,16 +758,16 @@ rte_table_hash_entry_delete_key32_ext(\n \tbucket10 = (struct rte_bucket_4_32 *)\t\t\t\\\n \t\t&f->memory[bucket10_index * f->bucket_size];\t\\\n \trte_prefetch0(bucket10);\t\t\t\t\\\n-\trte_prefetch0((void *)(((uintptr_t) bucket10) + CACHE_LINE_SIZE));\\\n-\trte_prefetch0((void *)(((uintptr_t) bucket10) + 2 * CACHE_LINE_SIZE));\\\n+\trte_prefetch0((void *)(((uintptr_t) bucket10) + RTE_CACHE_LINE_SIZE));\\\n+\trte_prefetch0((void *)(((uintptr_t) bucket10) + 2 * RTE_CACHE_LINE_SIZE));\\\n \t\t\t\t\t\t\t\t\\\n \tsignature11 = RTE_MBUF_METADATA_UINT32(mbuf11, f->signature_offset);\\\n \tbucket11_index = signature11 & (f->n_buckets - 1);\t\\\n \tbucket11 = (struct rte_bucket_4_32 *)\t\t\t\\\n \t\t&f->memory[bucket11_index * f->bucket_size];\t\\\n \trte_prefetch0(bucket11);\t\t\t\t\\\n-\trte_prefetch0((void *)(((uintptr_t) bucket11) + CACHE_LINE_SIZE));\\\n-\trte_prefetch0((void *)(((uintptr_t) bucket11) + 2 * CACHE_LINE_SIZE));\\\n+\trte_prefetch0((void *)(((uintptr_t) bucket11) + RTE_CACHE_LINE_SIZE));\\\n+\trte_prefetch0((void *)(((uintptr_t) bucket11) + 2 * RTE_CACHE_LINE_SIZE));\\\n }\n \n #define lookup2_stage2_lru(pkt20_index, pkt21_index, mbuf20, mbuf21,\\\ndiff --git a/lib/librte_table/rte_table_hash_key8.c b/lib/librte_table/rte_table_hash_key8.c\nindex d60c96e..512a8c3 100644\n--- a/lib/librte_table/rte_table_hash_key8.c\n+++ b/lib/librte_table/rte_table_hash_key8.c\n@@ -118,8 +118,8 @@ rte_table_hash_create_key8_lru(void *params, int socket_id, uint32_t entry_size)\n \n \t/* Check input parameters */\n \tif ((check_params_create_lru(p) != 0) ||\n-\t\t((sizeof(struct rte_table_hash) % CACHE_LINE_SIZE) != 0) ||\n-\t\t((sizeof(struct rte_bucket_4_8) % CACHE_LINE_SIZE) != 0)) {\n+\t\t((sizeof(struct rte_table_hash) % RTE_CACHE_LINE_SIZE) != 0) ||\n+\t\t((sizeof(struct rte_bucket_4_8) % RTE_CACHE_LINE_SIZE) != 0)) {\n \t\treturn NULL;\n \t}\n \tn_entries_per_bucket = 4;\n@@ -129,11 +129,11 @@ rte_table_hash_create_key8_lru(void *params, int socket_id, uint32_t entry_size)\n \tn_buckets = rte_align32pow2((p->n_entries + n_entries_per_bucket - 1) /\n \t\tn_entries_per_bucket);\n \tbucket_size_cl = (sizeof(struct rte_bucket_4_8) + n_entries_per_bucket *\n-\t\tentry_size + CACHE_LINE_SIZE - 1) / CACHE_LINE_SIZE;\n+\t\tentry_size + RTE_CACHE_LINE_SIZE - 1) / RTE_CACHE_LINE_SIZE;\n \ttotal_size = sizeof(struct rte_table_hash) + n_buckets *\n-\t\tbucket_size_cl * CACHE_LINE_SIZE;\n+\t\tbucket_size_cl * RTE_CACHE_LINE_SIZE;\n \n-\tf = rte_zmalloc_socket(\"TABLE\", total_size, CACHE_LINE_SIZE, socket_id);\n+\tf = rte_zmalloc_socket(\"TABLE\", total_size, RTE_CACHE_LINE_SIZE, socket_id);\n \tif (f == NULL) {\n \t\tRTE_LOG(ERR, TABLE,\n \t\t\t\"%s: Cannot allocate %u bytes for hash table\\n\",\n@@ -149,7 +149,7 @@ rte_table_hash_create_key8_lru(void *params, int socket_id, uint32_t entry_size)\n \tf->n_entries_per_bucket = n_entries_per_bucket;\n \tf->key_size = key_size;\n \tf->entry_size = entry_size;\n-\tf->bucket_size = bucket_size_cl * CACHE_LINE_SIZE;\n+\tf->bucket_size = bucket_size_cl * RTE_CACHE_LINE_SIZE;\n \tf->signature_offset = p->signature_offset;\n \tf->key_offset = p->key_offset;\n \tf->f_hash = p->f_hash;\n@@ -332,8 +332,8 @@ rte_table_hash_create_key8_ext(void *params, int socket_id, uint32_t entry_size)\n \n \t/* Check input parameters */\n \tif ((check_params_create_ext(p) != 0) ||\n-\t\t((sizeof(struct rte_table_hash) % CACHE_LINE_SIZE) != 0) ||\n-\t\t((sizeof(struct rte_bucket_4_8) % CACHE_LINE_SIZE) != 0))\n+\t\t((sizeof(struct rte_table_hash) % RTE_CACHE_LINE_SIZE) != 0) ||\n+\t\t((sizeof(struct rte_bucket_4_8) % RTE_CACHE_LINE_SIZE) != 0))\n \t\treturn NULL;\n \n \tn_entries_per_bucket = 4;\n@@ -345,14 +345,14 @@ rte_table_hash_create_key8_ext(void *params, int socket_id, uint32_t entry_size)\n \tn_buckets_ext = (p->n_entries_ext + n_entries_per_bucket - 1) /\n \t\tn_entries_per_bucket;\n \tbucket_size_cl = (sizeof(struct rte_bucket_4_8) + n_entries_per_bucket *\n-\t\tentry_size + CACHE_LINE_SIZE - 1) / CACHE_LINE_SIZE;\n-\tstack_size_cl = (n_buckets_ext * sizeof(uint32_t) + CACHE_LINE_SIZE - 1)\n-\t\t/ CACHE_LINE_SIZE;\n+\t\tentry_size + RTE_CACHE_LINE_SIZE - 1) / RTE_CACHE_LINE_SIZE;\n+\tstack_size_cl = (n_buckets_ext * sizeof(uint32_t) + RTE_CACHE_LINE_SIZE - 1)\n+\t\t/ RTE_CACHE_LINE_SIZE;\n \ttotal_size = sizeof(struct rte_table_hash) + ((n_buckets +\n \t\tn_buckets_ext) * bucket_size_cl + stack_size_cl) *\n-\t\tCACHE_LINE_SIZE;\n+\t\tRTE_CACHE_LINE_SIZE;\n \n-\tf = rte_zmalloc_socket(\"TABLE\", total_size, CACHE_LINE_SIZE, socket_id);\n+\tf = rte_zmalloc_socket(\"TABLE\", total_size, RTE_CACHE_LINE_SIZE, socket_id);\n \tif (f == NULL) {\n \t\tRTE_LOG(ERR, TABLE,\n \t\t\t\"%s: Cannot allocate %u bytes for hash table\\n\",\n@@ -368,7 +368,7 @@ rte_table_hash_create_key8_ext(void *params, int socket_id, uint32_t entry_size)\n \tf->n_entries_per_bucket = n_entries_per_bucket;\n \tf->key_size = key_size;\n \tf->entry_size = entry_size;\n-\tf->bucket_size = bucket_size_cl * CACHE_LINE_SIZE;\n+\tf->bucket_size = bucket_size_cl * RTE_CACHE_LINE_SIZE;\n \tf->signature_offset = p->signature_offset;\n \tf->key_offset = p->key_offset;\n \tf->f_hash = p->f_hash;\ndiff --git a/lib/librte_table/rte_table_hash_lru.c b/lib/librte_table/rte_table_hash_lru.c\nindex d1a4984..cea7a92 100644\n--- a/lib/librte_table/rte_table_hash_lru.c\n+++ b/lib/librte_table/rte_table_hash_lru.c\n@@ -155,8 +155,8 @@ rte_table_hash_lru_create(void *params, int socket_id, uint32_t entry_size)\n \t/* Check input parameters */\n \tif ((check_params_create(p) != 0) ||\n \t\t(!rte_is_power_of_2(entry_size)) ||\n-\t\t((sizeof(struct rte_table_hash) % CACHE_LINE_SIZE) != 0) ||\n-\t\t(sizeof(struct bucket) != (CACHE_LINE_SIZE / 2))) {\n+\t\t((sizeof(struct rte_table_hash) % RTE_CACHE_LINE_SIZE) != 0) ||\n+\t\t(sizeof(struct bucket) != (RTE_CACHE_LINE_SIZE / 2))) {\n \t\treturn NULL;\n \t}\n \n@@ -169,7 +169,7 @@ rte_table_hash_lru_create(void *params, int socket_id, uint32_t entry_size)\n \ttotal_size = table_meta_sz + bucket_sz + key_sz + key_stack_sz +\n \t\tdata_sz;\n \n-\tt = rte_zmalloc_socket(\"TABLE\", total_size, CACHE_LINE_SIZE, socket_id);\n+\tt = rte_zmalloc_socket(\"TABLE\", total_size, RTE_CACHE_LINE_SIZE, socket_id);\n \tif (t == NULL) {\n \t\tRTE_LOG(ERR, TABLE,\n \t\t\t\"%s: Cannot allocate %u bytes for hash table\\n\",\ndiff --git a/lib/librte_table/rte_table_lpm.c b/lib/librte_table/rte_table_lpm.c\nindex a175ff3..59f87bb 100644\n--- a/lib/librte_table/rte_table_lpm.c\n+++ b/lib/librte_table/rte_table_lpm.c\n@@ -96,7 +96,7 @@ rte_table_lpm_create(void *params, int socket_id, uint32_t entry_size)\n \t/* Memory allocation */\n \tnht_size = RTE_TABLE_LPM_MAX_NEXT_HOPS * entry_size;\n \ttotal_size = sizeof(struct rte_table_lpm) + nht_size;\n-\tlpm = rte_zmalloc_socket(\"TABLE\", total_size, CACHE_LINE_SIZE,\n+\tlpm = rte_zmalloc_socket(\"TABLE\", total_size, RTE_CACHE_LINE_SIZE,\n \t\tsocket_id);\n \tif (lpm == NULL) {\n \t\tRTE_LOG(ERR, TABLE,\ndiff --git a/lib/librte_table/rte_table_lpm_ipv6.c b/lib/librte_table/rte_table_lpm_ipv6.c\nindex e3d59d0..2818c25 100644\n--- a/lib/librte_table/rte_table_lpm_ipv6.c\n+++ b/lib/librte_table/rte_table_lpm_ipv6.c\n@@ -102,7 +102,7 @@ rte_table_lpm_ipv6_create(void *params, int socket_id, uint32_t entry_size)\n \t/* Memory allocation */\n \tnht_size = RTE_TABLE_LPM_MAX_NEXT_HOPS * entry_size;\n \ttotal_size = sizeof(struct rte_table_lpm_ipv6) + nht_size;\n-\tlpm = rte_zmalloc_socket(\"TABLE\", total_size, CACHE_LINE_SIZE,\n+\tlpm = rte_zmalloc_socket(\"TABLE\", total_size, RTE_CACHE_LINE_SIZE,\n \t\tsocket_id);\n \tif (lpm == NULL) {\n \t\tRTE_LOG(ERR, TABLE,\n",
    "prefixes": [
        "dpdk-dev",
        "1/3"
    ]
}