From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <simon.kagstrom@netinsight.net>
Received: from ernst.netinsight.se (ernst.netinsight.se [194.16.221.21])
by dpdk.org (Postfix) with SMTP id 205CA5A9B
for <dev@dpdk.org>; Wed, 20 May 2015 14:24:35 +0200 (CEST)
Received: from miho (unverified [10.100.1.152]) by ernst.netinsight.se
(EMWAC SMTPRS 0.83) with SMTP id <B0029951500@ernst.netinsight.se>;
Wed, 20 May 2015 14:24:27 +0200
Date: Wed, 20 May 2015 14:24:27 +0200
From: Simon Kagstrom <simon.kagstrom@netinsight.net>
To: dev@dpdk.org
Message-ID: <20150520142427.4b977210@miho>
X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.27; x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: [dpdk-dev] [PATCH] eal_common_options: Allow combining -m and
--no-huge
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>,
<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>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Wed, 20 May 2015 12:24:35 -0000
Needed to run as non-root but with higher memory allocations.
Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
Signed-off-by: Johan Faltstrom <johan.faltstrom@netinsight.net>
---
lib/librte_eal/common/eal_common_options.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c
index 8fcb1ab..89b867d 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -851,8 +851,8 @@ eal_check_common_options(struct internal_config *internal_cfg)
return -1;
}
if (internal_cfg->no_hugetlbfs &&
- (mem_parsed || internal_cfg->force_sockets == 1)) {
- RTE_LOG(ERR, EAL, "Options -m or --"OPT_SOCKET_MEM" cannot "
+ (internal_cfg->force_sockets == 1)) {
+ RTE_LOG(ERR, EAL, "Option --"OPT_SOCKET_MEM" cannot "
"be specified together with --"OPT_NO_HUGE"\n");
return -1;
}
--
1.9.1