From patchwork Mon Oct 1 22:46:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Yariv X-Patchwork-Id: 1532961 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 91B2CDFE80 for ; Mon, 1 Oct 2012 22:49:57 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TIolm-000797-6e; Mon, 01 Oct 2012 22:47:22 +0000 Received: from mail-qa0-f49.google.com ([209.85.216.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TIolM-00076m-4s for linux-arm-kernel@lists.infradead.org; Mon, 01 Oct 2012 22:46:56 +0000 Received: by mail-qa0-f49.google.com with SMTP id a17so74797qae.15 for ; Mon, 01 Oct 2012 15:46:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=DPwV64oncNv57Rw8Bnd0al+GUqVV2u1OFQUG9VgC/NQ=; b=XtxdfPvATDlRYSf3+HdoYKJ2dfHhtU0kSj4d5zwCYtZDjtVceMaexeZDuA08TLXvhq 58VEtV3VcBhhTAAhw41xBA/F0vxDgMUMuGGFU3QKV65SasJRDL/cZ196b4MvmnOsUTUK 1JWevxCFtJ77gODa3NKw7SJDA3XyHSzr+Ru6QWETh99fR5X9PGuR2m1O6nS7WNFsIZqY yGrAGpvGcs2Dd05Q271oexiXAcIRUg7qOB+1MnntBNxKqQlnrHcvdpDvv7du2QBCy0VP 5Gl/dXunpO7NHq6oVDoKBVqf/bxr1Mi6c9xoga/fQw1tr+DuVEHiBDryUT05UMA5DEjs bVHA== Received: by 10.49.71.77 with SMTP id s13mr1616539qeu.17.1349131615947; Mon, 01 Oct 2012 15:46:55 -0700 (PDT) Received: from localhost.localdomain (c-76-24-20-17.hsd1.ma.comcast.net. [76.24.20.17]) by mx.google.com with ESMTPS id f12sm599020qey.5.2012.10.01.15.46.54 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 01 Oct 2012 15:46:55 -0700 (PDT) From: Ido Yariv To: Tony Lindgren , Russell King , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v2 5/5] arm: omap: Move iopgtable header to drivers/iommu/ Date: Mon, 1 Oct 2012 18:46:31 -0400 Message-Id: <1349131591-10804-5-git-send-email-ido@wizery.com> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1349131591-10804-1-git-send-email-ido@wizery.com> References: <20120927195526.GP4840@atomide.com> <1349131591-10804-1-git-send-email-ido@wizery.com> X-Gm-Message-State: ALoCoQmCyIyBUC5e2Dk8KoKju7x/jC9FvVFkIc0MdA48jos2/mIrZe+t1V+/QHFO/qz+PVD5ErkV X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.216.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Ido Yariv X-BeenThere: linux-arm-kernel@lists.infradead.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 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The iopgtable header file is only used by the iommu & iovmm drivers, so move it to drivers/iommu/, as part of the single zImage effort. Signed-off-by: Ido Yariv --- drivers/iommu/omap-iommu-debug.c | 3 +-- drivers/iommu/omap-iommu.c | 3 +-- .../include/plat/iopgtable.h => drivers/iommu/omap-iopgtable.h | 0 drivers/iommu/omap-iovmm.c | 3 +-- 4 files changed, 3 insertions(+), 6 deletions(-) rename arch/arm/plat-omap/include/plat/iopgtable.h => drivers/iommu/omap-iopgtable.h (100%) diff --git a/drivers/iommu/omap-iommu-debug.c b/drivers/iommu/omap-iommu-debug.c index 8c1e30b..84dbfd2 100644 --- a/drivers/iommu/omap-iommu-debug.c +++ b/drivers/iommu/omap-iommu-debug.c @@ -22,8 +22,7 @@ #include #include -#include - +#include "omap-iopgtable.h" #include "omap-iommu.h" #define MAXCOLUMN 100 /* for short messages */ diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c index 6100334..1ca33b0 100644 --- a/drivers/iommu/omap-iommu.c +++ b/drivers/iommu/omap-iommu.c @@ -26,8 +26,7 @@ #include -#include - +#include "omap-iopgtable.h" #include "omap-iommu.h" #define for_each_iotlb_cr(obj, n, __i, cr) \ diff --git a/arch/arm/plat-omap/include/plat/iopgtable.h b/drivers/iommu/omap-iopgtable.h similarity index 100% rename from arch/arm/plat-omap/include/plat/iopgtable.h rename to drivers/iommu/omap-iopgtable.h diff --git a/drivers/iommu/omap-iovmm.c b/drivers/iommu/omap-iovmm.c index b5ac2cd..2820e3a 100644 --- a/drivers/iommu/omap-iovmm.c +++ b/drivers/iommu/omap-iovmm.c @@ -24,8 +24,7 @@ #include #include -#include - +#include "omap-iopgtable.h" #include "omap-iommu.h" static struct kmem_cache *iovm_area_cachep;