From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 889A2A051C for ; Tue, 11 Feb 2020 12:31:19 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7ED4B5B3C; Tue, 11 Feb 2020 12:31:19 +0100 (CET) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 89DBD1BFBE for ; Tue, 11 Feb 2020 12:31:18 +0100 (CET) Received: by mail-wr1-f66.google.com with SMTP id z7so11848685wrl.13 for ; Tue, 11 Feb 2020 03:31:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OYL9aDCGZtToMa8RzvOzHZmVZXV+pizx/ggjTkqlUp8=; b=Tjfg12ru3HqtOSXCOzzE40tUq2cfKY5YRB9kkdLwqWv27Sr5xd29Oi8jtvgqQKoOoG AacGCOlG+oy4/26yxsZIsI+DH8+8fGNmxHFYnjhieJPv0jAnkJs+D1Gm5MhTtvS+vFsw g9y6vGvQDO0CpJedYG6pctH1Z92c3MrxXzshAS6U2umeAzX74pIyntt227SNLrb/yN2B RopNXbbyZGsbp5KpOnl5w6dt7/HAfsS67G1NGpCJiYwqjQkq5vppNOIKrQGuxECWBO3D tR9u9VPcMw5UHWv2yI6FoCmprvobbwdDRkMToLorAsmReap9z7zxVAjPfNlwenI9tCb7 d8vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OYL9aDCGZtToMa8RzvOzHZmVZXV+pizx/ggjTkqlUp8=; b=G6P9j0yuRjcwKCHScvrvYQa0v1RhAFbQgF8Os5iFnVN7LYXYEVpRapsrO4aqV8uwrW Y1e1BMv9eT+2ON1xVDXSBjHOGWjoHUDgamxCRPhrY2H7mEHYk1fIBemnsl+x4PsqNrBA ZolbExvByMiLDUP74uxHUz7JOfCva6yAwUTQmEZCLxCEzX9LdCdsYuXivl6rOP3fObm/ mhcdLn4hNX5/dBbFyVzxVn3gkF5Gyo5RMsrgnK9fvvStoCSjOwJPne/RFsLtesem9eXy DIRr5dAMan58W2bxYydV3pR+N7JAORGFhvINYlrUL461TGeUutn9n1hBV0KIeGUL2Z+Q ygEA== X-Gm-Message-State: APjAAAWlFCkxKZ3USx20wzxOngSjSP+V4Fzp2AW+AYALx9rBoiA3Yeyq 8hveXbpQaCBRAPFnfeXImmE= X-Google-Smtp-Source: APXvYqxdfRX78XxOP2X34clWDNRZuNcsraVw6uO7xnC/gEeI9EA9BL9m+S8s9/sS3XbYn4qkb8Rh1g== X-Received: by 2002:adf:df90:: with SMTP id z16mr7922280wrl.273.1581420678226; Tue, 11 Feb 2020 03:31:18 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id a5sm3195359wmb.37.2020.02.11.03.31.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:31:17 -0800 (PST) From: luca.boccassi@gmail.com To: David Marchand Cc: dpdk stable Date: Tue, 11 Feb 2020 11:21:09 +0000 Message-Id: <20200211112216.3929-123-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'eal/windows: fix cpuset macro name' has been queued to stable release 19.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/13/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 9bbd7fe398e4c3b2aa03599f1a88549781366c99 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Mon, 2 Dec 2019 16:41:46 +0100 Subject: [PATCH] eal/windows: fix cpuset macro name [ upstream commit be67d057590ca01362e32cded3a28ff20e0bd14e ] Fix the name of CPU_SETSIZE in hope we can reuse it in other parts of the dpdk manipulating some rte_cpuset_t. Fixes: 4dc2b4d2a4cd ("eal/windows: add headers for compatibility") Signed-off-by: David Marchand --- lib/librte_eal/windows/eal/include/sched.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/librte_eal/windows/eal/include/sched.h b/lib/librte_eal/windows/eal/include/sched.h index 257060594c..29868c93d1 100644 --- a/lib/librte_eal/windows/eal/include/sched.h +++ b/lib/librte_eal/windows/eal/include/sched.h @@ -14,8 +14,8 @@ extern "C" { #endif -#ifndef CPU_SET_SIZE -#define CPU_SET_SIZE RTE_MAX_LCORE +#ifndef CPU_SETSIZE +#define CPU_SETSIZE RTE_MAX_LCORE #endif #define _BITS_PER_SET (sizeof(long long) * 8) @@ -26,7 +26,7 @@ extern "C" { #define _WHICH_BIT(b) ((b) & (_BITS_PER_SET - 1)) typedef struct _rte_cpuset_s { - long long _bits[_NUM_SETS(CPU_SET_SIZE)]; + long long _bits[_NUM_SETS(CPU_SETSIZE)]; } rte_cpuset_t; #define CPU_SET(b, s) ((s)->_bits[_WHICH_SET(b)] |= (1LL << _WHICH_BIT(b))) @@ -35,7 +35,7 @@ typedef struct _rte_cpuset_s { do { \ unsigned int _i; \ \ - for (_i = 0; _i < _NUM_SETS(CPU_SET_SIZE); _i++) \ + for (_i = 0; _i < _NUM_SETS(CPU_SETSIZE); _i++) \ (s)->_bits[_i] = 0LL; \ } while (0) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:43.030490909 +0000 +++ 0123-eal-windows-fix-cpuset-macro-name.patch 2020-02-11 11:17:38.612005311 +0000 @@ -1,13 +1,14 @@ -From be67d057590ca01362e32cded3a28ff20e0bd14e Mon Sep 17 00:00:00 2001 +From 9bbd7fe398e4c3b2aa03599f1a88549781366c99 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Mon, 2 Dec 2019 16:41:46 +0100 Subject: [PATCH] eal/windows: fix cpuset macro name +[ upstream commit be67d057590ca01362e32cded3a28ff20e0bd14e ] + Fix the name of CPU_SETSIZE in hope we can reuse it in other parts of the dpdk manipulating some rte_cpuset_t. Fixes: 4dc2b4d2a4cd ("eal/windows: add headers for compatibility") -Cc: stable@dpdk.org Signed-off-by: David Marchand ---