From patchwork Thu Aug 4 19:30:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Brooks X-Patchwork-Id: 73307 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp1559817qga; Thu, 4 Aug 2016 12:31:27 -0700 (PDT) X-Received: by 10.55.179.129 with SMTP id c123mr8345471qkf.70.1470339087867; Thu, 04 Aug 2016 12:31:27 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id p28si9207637qte.44.2016.08.04.12.31.25; Thu, 04 Aug 2016 12:31:27 -0700 (PDT) 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 dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 7D1EA6069C; Thu, 4 Aug 2016 19:31:25 +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_H2, 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 6337460811; Thu, 4 Aug 2016 19:30:25 +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 8C8BB60800; Thu, 4 Aug 2016 19:30:15 +0000 (UTC) Received: from mail-oi0-f44.google.com (mail-oi0-f44.google.com [209.85.218.44]) by lists.linaro.org (Postfix) with ESMTPS id 22EDF60800 for ; Thu, 4 Aug 2016 19:30:14 +0000 (UTC) Received: by mail-oi0-f44.google.com with SMTP id l203so930793oib.1 for ; Thu, 04 Aug 2016 12:30:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=B/yx/2QZzg3iFltLHbFUUECO0VlfiLxOylUIen77emA=; b=e35V7QtCGDZHbiwnLUi8TL/0dfiAwVD0v290kshLvLZ+DTR1wKaI3e6kTVMODvDnGM 6dfPFDgoyCGhJn5+m5ih12G1k02+MvFIvDiMZ8h75nQXO6YKiAAolhwb3Izzxb58mI7u 47eSxnx9EATmgcfHzN/zosXWwLn4PJjAnMCG3X/B2Jv2MN9gj85lKxopRPFoHfgODOTe yQlpHSTD28ZpaCpUTKNmWrlh4aoFzafNR4MsaUO4WNCaYc1bqDO/OMQFewBo3ZK/Cf7y FJXUZdh8LC6X/asnGOyd0ggdSt+zT6cdLhehfgAVNNAfge2zSAW5VHCJHt5p5AGbDnO8 U7cQ== X-Gm-Message-State: AEkooutS6o1jWzKY8izSeUkhiv7YcN7HoRneZR01udrO4eythG6OI2DGlH2Edz8JzKBP1V2zLr4= X-Received: by 10.157.16.28 with SMTP id h28mr48622219ote.23.1470339013653; Thu, 04 Aug 2016 12:30:13 -0700 (PDT) Received: from localhost.localdomain (adsl-68-248-140-212.dsl.applwi.ameritech.net. [68.248.140.212]) by smtp.gmail.com with ESMTPSA id o185sm6883540oif.26.2016.08.04.12.30.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Aug 2016 12:30:12 -0700 (PDT) From: Brian Brooks To: lng-odp@lists.linaro.org Date: Thu, 4 Aug 2016 14:30:03 -0500 Message-Id: <20160804193006.99010-3-brian.brooks@linaro.org> X-Mailer: git-send-email 2.9.2 In-Reply-To: <20160804193006.99010-1-brian.brooks@linaro.org> References: <20160804193006.99010-1-brian.brooks@linaro.org> X-Topics: Architecture patch Subject: [lng-odp] [PATCH v2 3/6] linux-generic: move cpu_arch.h up two directories 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: Brian Brooks --- platform/Makefile.inc | 8 ++++---- platform/linux-generic/Makefile.am | 2 +- platform/linux-generic/arch/default/{odp/api => }/cpu_arch.h | 0 platform/linux-generic/arch/mips64/{odp/api => }/cpu_arch.h | 0 platform/linux-generic/arch/powerpc/{odp/api => }/cpu_arch.h | 0 platform/linux-generic/arch/x86/{odp/api => }/cpu_arch.h | 0 platform/linux-generic/include/odp/api/align.h | 2 +- platform/linux-generic/include/odp/api/cpu.h | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) rename platform/linux-generic/arch/default/{odp/api => }/cpu_arch.h (100%) rename platform/linux-generic/arch/mips64/{odp/api => }/cpu_arch.h (100%) rename platform/linux-generic/arch/powerpc/{odp/api => }/cpu_arch.h (100%) rename platform/linux-generic/arch/x86/{odp/api => }/cpu_arch.h (100%) -- 2.9.2 diff --git a/platform/Makefile.inc b/platform/Makefile.inc index 2a4255c..e20bd3e 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -62,15 +62,15 @@ odpapispecinclude_HEADERS = \ $(top_srcdir)/include/odp/api/spec/version.h EXTRA_DIST = \ - arch/default/odp/api/cpu_arch.h \ + arch/default/cpu_arch.h \ arch/default/odp_cpu_arch.c \ arch/default/odp_sysinfo_parse.c \ - arch/mips64/odp/api/cpu_arch.h \ + arch/mips64/cpu_arch.h \ arch/mips64/odp_cpu_arch.c \ arch/mips64/odp_sysinfo_parse.c \ - arch/powerpc/odp/api/cpu_arch.h \ + arch/powerpc/cpu_arch.h \ arch/powerpc/odp_cpu_arch.c \ arch/powerpc/odp_sysinfo_parse.c \ - arch/x86/odp/api/cpu_arch.h \ + arch/x86/cpu_arch.h \ arch/x86/odp_cpu_arch.c \ arch/x86/odp_sysinfo_parse.c diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 0cfd0fe..8dc2764 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -56,7 +56,7 @@ odpapiinclude_HEADERS = \ $(srcdir)/include/odp/api/version.h \ $(srcdir)/include/odp/api/visibility_begin.h \ $(srcdir)/include/odp/api/visibility_end.h \ - $(srcdir)/arch/@ARCH_DIR@/odp/api/cpu_arch.h + $(srcdir)/arch/@ARCH_DIR@/cpu_arch.h odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ diff --git a/platform/linux-generic/arch/default/odp/api/cpu_arch.h b/platform/linux-generic/arch/default/cpu_arch.h similarity index 100% rename from platform/linux-generic/arch/default/odp/api/cpu_arch.h rename to platform/linux-generic/arch/default/cpu_arch.h diff --git a/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h b/platform/linux-generic/arch/mips64/cpu_arch.h similarity index 100% rename from platform/linux-generic/arch/mips64/odp/api/cpu_arch.h rename to platform/linux-generic/arch/mips64/cpu_arch.h diff --git a/platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h b/platform/linux-generic/arch/powerpc/cpu_arch.h similarity index 100% rename from platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h rename to platform/linux-generic/arch/powerpc/cpu_arch.h diff --git a/platform/linux-generic/arch/x86/odp/api/cpu_arch.h b/platform/linux-generic/arch/x86/cpu_arch.h similarity index 100% rename from platform/linux-generic/arch/x86/odp/api/cpu_arch.h rename to platform/linux-generic/arch/x86/cpu_arch.h diff --git a/platform/linux-generic/include/odp/api/align.h b/platform/linux-generic/include/odp/api/align.h index c238b80..9aa9f37 100644 --- a/platform/linux-generic/include/odp/api/align.h +++ b/platform/linux-generic/include/odp/api/align.h @@ -17,7 +17,7 @@ extern "C" { #endif -#include +#include "cpu_arch.h" /** @ingroup odp_compiler_optim * @{ diff --git a/platform/linux-generic/include/odp/api/cpu.h b/platform/linux-generic/include/odp/api/cpu.h index ae04769..4585d35 100644 --- a/platform/linux-generic/include/odp/api/cpu.h +++ b/platform/linux-generic/include/odp/api/cpu.h @@ -17,7 +17,7 @@ extern "C" { #endif -#include +#include "cpu_arch.h" static inline void odp_cpu_pause(void) {