From patchwork Fri Jan 27 14:29:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 92658 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp230671obz; Fri, 27 Jan 2017 06:34:47 -0800 (PST) X-Received: by 10.55.43.158 with SMTP id r30mr9352756qkr.28.1485527687083; Fri, 27 Jan 2017 06:34:47 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id b14si1441766qkc.252.2017.01.27.06.34.46; Fri, 27 Jan 2017 06:34:47 -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 B20CF62DE5; Fri, 27 Jan 2017 14:34:46 +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=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, 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 154F160A27; Fri, 27 Jan 2017 14:30:49 +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 8EF9660E18; Fri, 27 Jan 2017 14:30:45 +0000 (UTC) Received: from mail-lf0-f43.google.com (mail-lf0-f43.google.com [209.85.215.43]) by lists.linaro.org (Postfix) with ESMTPS id EB335609EF for ; Fri, 27 Jan 2017 14:29:53 +0000 (UTC) Received: by mail-lf0-f43.google.com with SMTP id x1so76116807lff.0 for ; Fri, 27 Jan 2017 06:29:53 -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=nzAwqbGVmIj929+/InHiJfN7llAKo/MV8KHT7s6BnCw=; b=GhpPRaVt/xxQHUElbbPYVoo3qUVpu7V0wyB4VdC+tfDKBWW0yodjBeF7oDYwCgSRTK WQxAY8ZP/awjvWuOG+lh7xlFU+C8nQDF2FzLwkaRei3beA58mzJ6mKHDqQ7exSiBMXEe VstX/jXO+DfnUQcZQpb1AHKQT/KjgD46tRMcyKu9+tSP3ZFmwXsIyRsUmQk/Vg2IhVyS RD80ztuKPlX5swRNj/qg3r4E+ml8ZW0k/CnfdwlMgSfkzV5S8x0wnGM9HnuuJj8e3XRr EL+cOm0vzYMBGWmKuhNxsijtksu9IHamnbEWGDFI7Jey7mDpkrucpFOsJANvYKlODqE0 J7Gw== X-Gm-Message-State: AIkVDXINWruTL5wULS2THpaNjEOuWCuY/NKwIHGWndXeS+oFt5loW65e+mTGlCEKli6A1+hv9Rs= X-Received: by 10.46.69.7 with SMTP id s7mr3291034lja.44.1485527392390; Fri, 27 Jan 2017 06:29:52 -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.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 06:29:51 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 27 Jan 2017 17:29:13 +0300 Message-Id: <20170127142921.29029-8-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 07/15] merge fix: odp_init.c 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/odp_init.c | 12 ------------ 1 file changed, 12 deletions(-) -- 2.11.0.295.gd7dffce diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 94e06319..2cd8fe3f 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -10,11 +10,8 @@ #include #include #include -<<<<<<< HEAD #include #include -======= ->>>>>>> v1.13.0.0 #include #include #include @@ -25,7 +22,6 @@ #define _ODP_FILES_FMT "odp-%d-" #define _ODP_TMPDIR "/tmp" -<<<<<<< HEAD /* the name of the ODP configuration file: */ #define CONFIGURATION_FILE_ENV_NONE "none" @@ -35,8 +31,6 @@ /* the ODP configuration file name can also be oveerwritten by env. variable: */ #define ODP_SYSCONFIG_FILE_ENV "ODP_SYSCONFIG_FILE" -======= ->>>>>>> v1.13.0.0 struct odp_global_data_s odp_global_data; @@ -82,7 +76,6 @@ static int cleanup_files(const char *dirpath, int odp_pid) return 0; } -<<<<<<< HEAD /* read the odp configuration file * * the configuration file is read from: @@ -149,8 +142,6 @@ static int read_configfile(void) return 0; } -======= ->>>>>>> v1.13.0.0 int odp_init_global(odp_instance_t *instance, const odp_init_t *params, const odp_platform_init_t *platform_params ODP_UNUSED) @@ -173,12 +164,9 @@ int odp_init_global(odp_instance_t *instance, cleanup_files(_ODP_TMPDIR, odp_global_data.main_pid); -<<<<<<< HEAD if (read_configfile()) goto init_failed; -======= ->>>>>>> v1.13.0.0 if (odp_cpumask_init_global(params)) { ODP_ERR("ODP cpumask init failed.\n"); goto init_failed;