From patchwork Fri Jan 27 14:29:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 92656 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp230003obz; Fri, 27 Jan 2017 06:33:12 -0800 (PST) X-Received: by 10.36.46.5 with SMTP id i5mr3448582ita.23.1485527592348; Fri, 27 Jan 2017 06:33:12 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id b187si1790352itc.36.2017.01.27.06.33.12; Fri, 27 Jan 2017 06:33:12 -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 D31E360DD0; Fri, 27 Jan 2017 14:33:11 +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 E258160DED; Fri, 27 Jan 2017 14:30:04 +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 AABA5609D7; Fri, 27 Jan 2017 14:29:52 +0000 (UTC) Received: from mail-lf0-f54.google.com (mail-lf0-f54.google.com [209.85.215.54]) by lists.linaro.org (Postfix) with ESMTPS id CFCAD609AD for ; Fri, 27 Jan 2017 14:29:51 +0000 (UTC) Received: by mail-lf0-f54.google.com with SMTP id n124so162426358lfd.2 for ; Fri, 27 Jan 2017 06:29:51 -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=WQUreD2KrdMIIVEjD5aUcFDehEcxDhh50TLAAwJ/yZs=; b=F5axJZzR1sCzzkU/DTn+2+HXVwIIpFaEVGkEtH79ONCDBh46V4FMaqRlbw9JC7Vd7R gfoSKxeFiJaGlL2m1WzQEpc3UPvEjaeWojbRpdIXIY1bAEXDkNiTf4hnSXaSS21Gh8ad xMDxO/geB6DkiZLBamAuhZoD6DcdlA5OxSKQ4tR3ZqJoblxaP2QPgBx6T+fzdWYGRnuZ eFUxF6wZ3/QreUFx40NJpUcLHW29K6rofaq5RIqLT30Xuv7MCnuQwXMniq/pNjE/bNWI O0ibDDn1cUU+xcdrEbk3P4xb57wDGUniH4TWHKhlt507QKKGwTr35oeHvJDwepzTqBAY 4eaA== X-Gm-Message-State: AIkVDXIxw5k1qQVu6tE6+fWhAesaZ0wXV0KnhRzqVPLvqi4qDnde8EZssV5iV3pP3cuLel3au2s= X-Received: by 10.46.14.18 with SMTP id 18mr3076901ljo.67.1485527390404; Fri, 27 Jan 2017 06:29:50 -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.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 06:29:49 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 27 Jan 2017 17:29:11 +0300 Message-Id: <20170127142921.29029-6-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 05/15] merge fix: odp_schedule_if.h 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/include/odp_schedule_if.h | 6 ------ 1 file changed, 6 deletions(-) -- 2.11.0.295.gd7dffce diff --git a/platform/linux-generic/include/odp_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h index d1cbf988..530d157f 100644 --- a/platform/linux-generic/include/odp_schedule_if.h +++ b/platform/linux-generic/include/odp_schedule_if.h @@ -35,10 +35,7 @@ typedef int (*schedule_term_local_fn_t)(void); typedef void (*schedule_order_lock_fn_t)(void); typedef void (*schedule_order_unlock_fn_t)(void); typedef unsigned (*schedule_max_ordered_locks_fn_t)(void); -<<<<<<< HEAD typedef void (*schedule_save_context_fn_t)(queue_entry_t *queue); -======= ->>>>>>> v1.13.0.0 typedef struct schedule_fn_t { schedule_pktio_start_fn_t pktio_start; @@ -57,10 +54,7 @@ typedef struct schedule_fn_t { schedule_order_lock_fn_t order_lock; schedule_order_unlock_fn_t order_unlock; schedule_max_ordered_locks_fn_t max_ordered_locks; -<<<<<<< HEAD schedule_save_context_fn_t save_context; -======= ->>>>>>> v1.13.0.0 } schedule_fn_t; /* Interface towards the scheduler */