From patchwork Thu Feb 5 09:17:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taras Kondratiuk X-Patchwork-Id: 44411 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CD74121173 for ; Thu, 5 Feb 2015 09:17:57 +0000 (UTC) Received: by mail-lb0-f199.google.com with SMTP id f15sf4478234lbj.2 for ; Thu, 05 Feb 2015 01:17:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:subject :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=VhTmy08Sr1xwuD0YA+ACccZ3kGIJTucyB5VQXytBoN4=; b=CZ20Ua5A2Zgj46ODA6/gdwMSUvEj2OHRc2dYB4Wvp735CgEaBs2L38ewsXQrFWkLgj 6WD3Dus9/BPQ1+5skdHeG1pjVD9wksiB451w3xJPl/Q0E3vf1jsxyGpNgx+tt75MbZ+m gilCYaynKVeCQ5Oghuke8KOlV3oBSs8InGjZDocN7f4Mn0IwaXA6ji5OnGB7tn4iEQow d+iSLEp5wDq9o+rRqlFdTrN0MbOc9OAj74H8URkKPfJ0TaUPmLSX5Nhe9OaW0ihJahas wpuYKTlDUFU0VEgoR/msdSrppkU9pHQBt5gcbxLetoY315k0HrI5uiSyLVd2+IN81+0c eAqQ== X-Gm-Message-State: ALoCoQmvpEVztGbAo3kEVjLLbcVL7D/md/NaehRU7H4DKlHpMhdhkuzLfMajNvz97CPvlMXuEHJn X-Received: by 10.180.105.228 with SMTP id gp4mr3287284wib.6.1423127876722; Thu, 05 Feb 2015 01:17:56 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.229 with SMTP id v5ls126002lav.55.gmail; Thu, 05 Feb 2015 01:17:56 -0800 (PST) X-Received: by 10.152.43.97 with SMTP id v1mr2253039lal.85.1423127876437; Thu, 05 Feb 2015 01:17:56 -0800 (PST) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com. [209.85.217.178]) by mx.google.com with ESMTPS id p14si3448921lal.67.2015.02.05.01.17.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Feb 2015 01:17:56 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by mail-lb0-f178.google.com with SMTP id u10so5920795lbd.9 for ; Thu, 05 Feb 2015 01:17:56 -0800 (PST) X-Received: by 10.112.25.104 with SMTP id b8mr2248839lbg.69.1423127875964; Thu, 05 Feb 2015 01:17:55 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp1017740lbj; Thu, 5 Feb 2015 01:17:55 -0800 (PST) X-Received: by 10.224.54.131 with SMTP id q3mr6110898qag.102.1423127874801; Thu, 05 Feb 2015 01:17:54 -0800 (PST) Received: from ip-10-35-177-41.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id v64si5493156qge.35.2015.02.05.01.17.50 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 05 Feb 2015 01:17:54 -0800 (PST) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-35-177-41.ec2.internal) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YJIZH-0006b4-9L; Thu, 05 Feb 2015 09:17:47 +0000 Received: from mail-lb0-f176.google.com ([209.85.217.176]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YJIZB-0006az-TT for lng-odp@lists.linaro.org; Thu, 05 Feb 2015 09:17:42 +0000 Received: by mail-lb0-f176.google.com with SMTP id w7so1553913lbi.7 for ; Thu, 05 Feb 2015 01:17:36 -0800 (PST) X-Received: by 10.112.224.133 with SMTP id rc5mr2245730lbc.31.1423127855951; Thu, 05 Feb 2015 01:17:35 -0800 (PST) Received: from localhost.localdomain ([80.77.38.170]) by mx.google.com with ESMTPSA id cn5sm837988lbd.41.2015.02.05.01.17.34 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 05 Feb 2015 01:17:35 -0800 (PST) From: Taras Kondratiuk To: lng-odp@lists.linaro.org Date: Thu, 5 Feb 2015 11:17:24 +0200 Message-Id: <1423127844-28686-1-git-send-email-taras.kondratiuk@linaro.org> X-Mailer: git-send-email 1.9.1 X-Topics: patch Subject: [lng-odp] [PATCH] linux-generic: init: fix odp_global_data definition X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: lng-odp-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: taras.kondratiuk@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 odp_global_data should be defined once in a C file. Signed-off-by: Taras Kondratiuk --- platform/linux-generic/include/odp_internal.h | 6 ++++-- platform/linux-generic/odp_init.c | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index 9a6e29d..1d611e8 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -20,10 +20,12 @@ extern "C" { #include -struct odp_global_data { +struct odp_global_data_s { odp_log_func_t log_fn; odp_abort_func_t abort_fn; -} odp_global_data; +}; + +extern struct odp_global_data_s odp_global_data; int odp_system_info_init(void); diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 74c893f..cd8dc46 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -9,6 +9,7 @@ #include #include +struct odp_global_data_s odp_global_data; int odp_init_global(odp_init_t *params ODP_UNUSED, odp_platform_init_t *platform_params ODP_UNUSED)