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 28A774A63
 for <dev@dpdk.org>; Mon, 23 Mar 2015 15:33:49 +0100 (CET)
Received: from miho (unverified [10.100.1.152]) by ernst.netinsight.se
 (EMWAC SMTPRS 0.83) with SMTP id <B0029393011@ernst.netinsight.se>;
 Mon, 23 Mar 2015 15:33:41 +0100
Date: Mon, 23 Mar 2015 15:33:41 +0100
From: Simon Kagstrom <simon.kagstrom@netinsight.net>
To: dev@dpdk.org
Message-ID: <20150323153341.081dd435@miho>
X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.23; x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: [dpdk-dev] [PATCH] librte_eal: Allow combining --no-huge with -m XXX
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: Mon, 23 Mar 2015 14:33:49 -0000

Useful to run applications in usermode via a test driver.

Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
---
Not sure if there are other implications of this, so please check!

 lib/librte_eal/common/eal_common_options.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c
index 4319549..af865f5 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -850,7 +850,7 @@ eal_check_common_options(struct internal_config *internal_cfg)
 		return -1;
 	}
 	if (internal_cfg->no_hugetlbfs &&
-			(mem_parsed || internal_cfg->force_sockets == 1)) {
+			(internal_cfg->force_sockets == 1)) {
 		RTE_LOG(ERR, EAL, "Options -m or --"OPT_SOCKET_MEM" cannot "
 			"be specified together with --"OPT_NO_HUGE"\n");
 		return -1;
-- 
1.9.1