From patchwork Fri Jan 27 14:29:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 92654 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp229459obz; Fri, 27 Jan 2017 06:31:55 -0800 (PST) X-Received: by 10.55.141.5 with SMTP id p5mr9216686qkd.36.1485527515759; Fri, 27 Jan 2017 06:31:55 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id k28si3645128qtf.116.2017.01.27.06.31.55; Fri, 27 Jan 2017 06:31:55 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 1F91162E01; Fri, 27 Jan 2017 14:31:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 2072360D7B; Fri, 27 Jan 2017 14:29:59 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 71273609AD; Fri, 27 Jan 2017 14:29:50 +0000 (UTC) Received: from mail-lf0-f46.google.com (mail-lf0-f46.google.com [209.85.215.46]) by lists.linaro.org (Postfix) with ESMTPS id 61852609AD for ; Fri, 27 Jan 2017 14:29:49 +0000 (UTC) Received: by mail-lf0-f46.google.com with SMTP id n124so162425734lfd.2 for ; Fri, 27 Jan 2017 06:29:49 -0800 (PST) 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; bh=W75vQSEST9FchoknfMMp5/+Uh8PVdM5tLGmCVbIJSrA=; b=iZzSTBKwO33r8a4RYBTayya5zBnhu6dlzs3qnhrkFxLmRMuz4O96l68odFfV1Yfy63 6skK2HdquAdwQomlGMKDyEr51fZLNgt5fmdz4IC5DoD4V9Gt2ohIQRhdsLPwmGJFiZw7 NTg9U/dlc13nukIUfioJPppXiyUaBOU5bkgtRYorm4QahrRSYdptCi6IR88M1tduevhJ uudwq6x+hsOHj7OWHR3/JQ/rE+ikKLo1CpEU1SrgscejVd0Xw/n3GlSsY0TAwzHIkUcI JQMquF9Ap/cfFa2W6fOrGb77WXhAXaDTA9jCy8ZLAJKUCwWZxqOi28UajgXQHRGd6MWi bMzg== X-Gm-Message-State: AIkVDXK7CtZF+zecxjxxABlYQHqve6VhFxDumIHQtX4YOBhqaaaUUR0pfnlDeoPME6SQ6hpXcDI= X-Received: by 10.25.228.157 with SMTP id x29mr2536169lfi.125.1485527388111; Fri, 27 Jan 2017 06:29:48 -0800 (PST) Received: from localhost.localdomain (ppp109-252-7-40.pppoe.spdop.ru. [109.252.7.40]) by smtp.gmail.com with ESMTPSA id t9sm1325479lja.48.2017.01.27.06.29.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 06:29:47 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 27 Jan 2017 17:29:09 +0300 Message-Id: <20170127142921.29029-4-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.11.0.295.gd7dffce In-Reply-To: <20170127142921.29029-1-maxim.uvarov@linaro.org> References: <20170127142921.29029-1-maxim.uvarov@linaro.org> Subject: [lng-odp] [API-NEXT PATCH 03/15] merge fix: _ishm X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Signed-off-by: Maxim Uvarov --- platform/linux-generic/_ishm.c | 21 --------------------- platform/linux-generic/include/odp_internal.h | 6 ------ 2 files changed, 27 deletions(-) -- 2.11.0.295.gd7dffce diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c index 038ba1e6..4c2578b1 100644 --- a/platform/linux-generic/_ishm.c +++ b/platform/linux-generic/_ishm.c @@ -52,20 +52,14 @@ #include #include #include -<<<<<<< HEAD #include -======= ->>>>>>> v1.13.0.0 #include #include #include #include <_fdserver_internal.h> #include <_ishm_internal.h> #include <_ishmphy_internal.h> -<<<<<<< HEAD #include <_ishmpool_internal.h> -======= ->>>>>>> v1.13.0.0 #include #include #include @@ -88,22 +82,12 @@ * if some of the block ownwers never procsync() after free). This number * should take that into account) */ -<<<<<<< HEAD #define ISHM_MAX_NB_BLOCKS ODPDRV_CONFIG_SHM_BLOCKS /* * Maximum internal shared memory block name length in chars */ #define ISHM_NAME_MAXLEN ODPDRV_SHM_NAME_LEN -======= -#define ISHM_MAX_NB_BLOCKS 128 - -/* - * Maximum internal shared memory block name length in chars - * probably taking the same number as SHM name size make sense at this stage - */ -#define ISHM_NAME_MAXLEN 32 ->>>>>>> v1.13.0.0 /* * Linux underlying file name: /odp--ishm- @@ -1458,7 +1442,6 @@ int _odp_ishm_init_global(void) * is performed for the main thread... Many init_global() functions * indeed assume the availability of odp_shm_reserve()...: */ -<<<<<<< HEAD if (do_odp_ishm_init_local()) { ODP_ERR("unable to init the main thread\n."); goto init_glob_err4; @@ -1472,10 +1455,6 @@ int _odp_ishm_init_global(void) init_glob_err4: if (_odp_ishmphy_unbook_va()) ODP_ERR("unable to unbook virtual space\n."); -======= - return do_odp_ishm_init_local(); - ->>>>>>> v1.13.0.0 init_glob_err3: if (munmap(ishm_ftbl, sizeof(ishm_ftable_t)) < 0) ODP_ERR("unable to munmap main fragment table\n."); diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index 7abfd862..05c8a422 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -51,10 +51,7 @@ struct odp_global_data_s { odp_cpumask_t control_cpus; odp_cpumask_t worker_cpus; int num_cpus_installed; -<<<<<<< HEAD config_t configuration; -======= ->>>>>>> v1.13.0.0 }; enum init_stage { @@ -133,11 +130,8 @@ int _odp_ishm_init_local(void); int _odp_ishm_term_global(void); int _odp_ishm_term_local(void); -<<<<<<< HEAD int _odp_modules_init_global(void); -======= ->>>>>>> v1.13.0.0 int cpuinfo_parser(FILE *file, system_info_t *sysinfo); uint64_t odp_cpu_hz_current(int id);