From patchwork Tue Mar 7 20:55:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 9609821 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F3F8A602B4 for ; Tue, 7 Mar 2017 20:59:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C04492853B for ; Tue, 7 Mar 2017 20:59:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B34F02853D; Tue, 7 Mar 2017 20:59:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_SORBS_SPAM autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 40F932853B for ; Tue, 7 Mar 2017 20:59:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=c3OgZKri73OBfgM24mtBhC5h4gjk9zROQJnNPvF8rQ0=; b=n48SPLHmeghqGT8WkCnxw+B+8g JjStgJA55euk1sm4IK9AY8r/Ra196oaDX3e0JCljN8dvRdZNcJKCwfA0pQ65TMVssMHnjbW3sdZfK MZ+bXTuQV4DhOkcge9VSSHvLEZifwmdL9kEYvjm2KzkLDTPnDJdSJzGaOsjjYcBVWyCfwREP7PBw6 2ryynAPgqpD7cI+pIS1ETgd65HpXuordELc78/bZsllj99m3CCadZpN9XRetB+Q4JqMQ4RFBlBna8 m6ZSWvr6aWF2qkoJqqEBvpVmAWzx5uUSwiHMjdcJBSgRX5NAx9DyrLNYxw7vxy1t4CJwjJHWWAg8m Xme9GdsQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1clMCn-0005bp-H6; Tue, 07 Mar 2017 20:59:37 +0000 Received: from mail-qk0-f175.google.com ([209.85.220.175]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1clM9n-0003C1-Ex for linux-arm-kernel@lists.infradead.org; Tue, 07 Mar 2017 20:56:33 +0000 Received: by mail-qk0-f175.google.com with SMTP id p64so25621318qke.1 for ; Tue, 07 Mar 2017 12:56:11 -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=/sDK0jv041cQPQ7G0zut+htROd71Tgt2fE9ioqL88K0=; b=U/rgs/Y0LoCmSFS7AhyVjxSltGJL9EMe2nFzIzhiwOyei65+jokUch3FzdxctGgWTx yiJCcrzEBYtA8XuLiRvMpPq9ITF0xGeWVX00HkQQ3nUmD+bdv/UbL8pQFNem2rKJvZB5 Rhd5wyCes/gra4nvIXy3EkjyHxE+KAXZgFm6R/DEcjZxrAQ6t2iwvDbUvPUx5UL/ETa5 /iJL/J04CuFfyTbSORHK8C03YN9HvEwiHH6AsbIikmj/CrMEJawX2LNAuMPH9NGUzHMt vzaX3R+mxPzRUJntX5XFBGY6S/WoeZpyJJBC8W31UG5dIiGJZjQuVq1Qh3kN3/6H8q95 l0Lg== X-Gm-Message-State: AMke39n3QSrpYkLKngOHmXBkfTNJ13Cu8j7yrxZGKlm7X4yVTBndIieyVSWT3w2V7F2cZnFz X-Received: by 10.200.49.162 with SMTP id h31mr3369001qte.50.1488920170357; Tue, 07 Mar 2017 12:56:10 -0800 (PST) Received: from labbott-redhat-machine.redhat.com ([2601:602:9802:a8dc::5ce7]) by smtp.gmail.com with ESMTPSA id z196sm764343qkb.11.2017.03.07.12.56.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Mar 2017 12:56:08 -0800 (PST) From: Laura Abbott To: David Airlie Subject: [PATCHv3 07/16] drm: Use set_memory.h header Date: Tue, 7 Mar 2017 12:55:24 -0800 Message-Id: <1488920133-27229-8-git-send-email-labbott@redhat.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488920133-27229-1-git-send-email-labbott@redhat.com> References: <1488920133-27229-1-git-send-email-labbott@redhat.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170307_125631_582823_884A9B82 X-CRM114-Status: GOOD ( 11.96 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Alexander Shishkin , Catalin Marinas , Heiko Carstens , Takashi Iwai , Wim Van Sebroeck , "H. Peter Anvin" , linux-watchdog@vger.kernel.org, linux-arch@vger.kernel.org, linux-s390@vger.kernel.org, Jessica Yu , Daniel Borkmann , x86@kernel.org, Russell King , Ingo Molnar , Laura Abbott , Guenter Roeck , Kees Cook , Arnd Bergmann , Will Deacon , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Martin Schwidefsky , Andrew Morton , "David S. Miller" MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP set_memory_* functions have moved to set_memory.h. Switch to this explicitly. Signed-off-by: Laura Abbott --- v3: Add some #ifdef CONFIG_X86 --- drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 3 +++ drivers/gpu/drm/gma500/gtt.c | 1 + drivers/gpu/drm/gma500/psb_drv.c | 1 + drivers/gpu/drm/radeon/radeon_gart.c | 3 +++ drivers/gpu/drm/ttm/ttm_page_alloc.c | 3 +++ drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 3 +++ drivers/gpu/drm/ttm/ttm_tt.c | 3 +++ 7 files changed, 17 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c index 964d2a94..b135521 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c @@ -27,6 +27,9 @@ */ #include #include +#ifdef CONFIG_X86 +#include +#endif #include "amdgpu.h" /* diff --git a/drivers/gpu/drm/gma500/gtt.c b/drivers/gpu/drm/gma500/gtt.c index 3f4f424..3949b09 100644 --- a/drivers/gpu/drm/gma500/gtt.c +++ b/drivers/gpu/drm/gma500/gtt.c @@ -21,6 +21,7 @@ #include #include +#include #include "psb_drv.h" #include "blitter.h" diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c index 5ee93ff..1f9b35a 100644 --- a/drivers/gpu/drm/gma500/psb_drv.c +++ b/drivers/gpu/drm/gma500/psb_drv.c @@ -35,6 +35,7 @@ #include #include #include +#include static struct drm_driver driver; static int psb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent); diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c index c4777c8..0b3ec35 100644 --- a/drivers/gpu/drm/radeon/radeon_gart.c +++ b/drivers/gpu/drm/radeon/radeon_gart.c @@ -27,6 +27,9 @@ */ #include #include +#ifdef CONFIG_X86 +#include +#endif #include "radeon.h" /* diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c index a37de5d..eeddc1e 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c @@ -51,6 +51,9 @@ #if IS_ENABLED(CONFIG_AGP) #include #endif +#ifdef CONFIG_X86 +#include +#endif #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *)) #define SMALL_ALLOCATION 16 diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c index cec4b4b..90ddbdc 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c @@ -53,6 +53,9 @@ #if IS_ENABLED(CONFIG_AGP) #include #endif +#ifdef CONFIG_X86 +#include +#endif #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *)) #define SMALL_ALLOCATION 4 diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index aee3c00..5260179 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c @@ -44,6 +44,9 @@ #include #include #include +#ifdef CONFIG_X86 +#include +#endif /** * Allocates storage for pointers to the pages that back the ttm.