From patchwork Fri Oct 17 14:27:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Capper X-Patchwork-Id: 38877 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f70.google.com (mail-ee0-f70.google.com [74.125.83.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D3302202DB for ; Fri, 17 Oct 2014 14:29:43 +0000 (UTC) Received: by mail-ee0-f70.google.com with SMTP id c13sf629163eek.1 for ; Fri, 17 Oct 2014 07:29:42 -0700 (PDT) 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:subject:date:message-id :mime-version:cc:precedence:list-id:list-unsubscribe:list-archive :list-post:list-help:list-subscribe:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=WtWv3rYqXaRNx9eAYRQwH39ZHWwzdbnpI4TjI2s7gD0=; b=M785d7TSnzoCjGB5Lk6Ykz0x2vgCYuzbtmjqMxf3LQYPcHdxjDYKhYHdInh6ocGVwl HscfWEKRoc01eRThQUhUqZQRR0fZB08bBMsw1QwDp44Td+g9UX3CMf8HVs8R7TJkMK4P i1aWMjTTttKhUMjhQWX25hFdt8ehXiUycSgbWqfzbToUc9k9bHp4aMj5ilRlJaxysK1v TyMfd+iRkbv7GIE9+mFSFKzicY70/Fadjfy+9N+axnLKC1M0hEK9bqQ3btmw17gWIA87 Z5Kb5jrfL5YoeZDycgN+qZPzOOnCefYdm7kGZhMxXwJksQhgkN3e3+ATkdTM/UiO+kao mdBQ== X-Gm-Message-State: ALoCoQm5SIZzVBiUVHQiHLPmCr9LyjKQW/3nHrF40yg4SIqDB7cFLuZVEEZV9+rWn0Yah4O8jB1V X-Received: by 10.152.4.165 with SMTP id l5mr1430611lal.4.1413556182633; Fri, 17 Oct 2014 07:29:42 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.72 with SMTP id q8ls217665laq.98.gmail; Fri, 17 Oct 2014 07:29:42 -0700 (PDT) X-Received: by 10.112.87.162 with SMTP id az2mr6004117lbb.15.1413556182294; Fri, 17 Oct 2014 07:29:42 -0700 (PDT) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com. [209.85.217.173]) by mx.google.com with ESMTPS id rq6si2353069lbb.21.2014.10.17.07.29.42 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 17 Oct 2014 07:29:42 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) client-ip=209.85.217.173; Received: by mail-lb0-f173.google.com with SMTP id 10so774765lbg.4 for ; Fri, 17 Oct 2014 07:29:42 -0700 (PDT) X-Received: by 10.112.12.35 with SMTP id v3mr9221363lbb.80.1413556182132; Fri, 17 Oct 2014 07:29:42 -0700 (PDT) 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.84.229 with SMTP id c5csp237676lbz; Fri, 17 Oct 2014 07:29:41 -0700 (PDT) X-Received: by 10.66.241.202 with SMTP id wk10mr9116627pac.88.1413556179466; Fri, 17 Oct 2014 07:29:39 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id sc7si1302871pbb.116.2014.10.17.07.29.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Oct 2014 07:29:39 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xf8Vq-0004ah-5Z; Fri, 17 Oct 2014 14:28:14 +0000 Received: from mail-wi0-f170.google.com ([209.85.212.170]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xf8Vo-0004Y7-09 for linux-arm-kernel@lists.infradead.org; Fri, 17 Oct 2014 14:28:12 +0000 Received: by mail-wi0-f170.google.com with SMTP id hi2so3928233wib.3 for ; Fri, 17 Oct 2014 07:27:48 -0700 (PDT) X-Received: by 10.180.75.11 with SMTP id y11mr14000392wiv.11.1413556068226; Fri, 17 Oct 2014 07:27:48 -0700 (PDT) Received: from marmot.wormnet.eu (marmot.wormnet.eu. [188.246.204.87]) by mx.google.com with ESMTPSA id i1sm5829071wix.23.2014.10.17.07.27.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Oct 2014 07:27:47 -0700 (PDT) From: Steve Capper To: catalin.marinas@arm.com Subject: [PATCH] arm64: mm: Correct fixmap pagetable types Date: Fri, 17 Oct 2014 15:27:38 +0100 Message-Id: <1413556058-27432-1-git-send-email-steve.capper@linaro.org> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141017_072812_209418_B71E9D09 X-CRM114-Status: UNSURE ( 8.99 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.212.170 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.212.170 listed in wl.mailspike.net] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: Steve Capper , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: steve.capper@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.173 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 Compiling with STRICT_MM_TYPECHECKS gives the following arch/arm64/mm/ioremap.c: In function ‘early_ioremap_init’: arch/arm64/mm/ioremap.c:152:2: warning: passing argument 3 of ‘pud_populate’ from incompatible pointer type pud_populate(&init_mm, pud, bm_pmd); The data types for bm_pmd and bm_pud are incorrectly set to pte_t. This patch corrects these types. Signed-off-by: Steve Capper --- arch/arm64/mm/ioremap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/mm/ioremap.c b/arch/arm64/mm/ioremap.c index fa324bd..4a07630 100644 --- a/arch/arm64/mm/ioremap.c +++ b/arch/arm64/mm/ioremap.c @@ -105,10 +105,10 @@ EXPORT_SYMBOL(ioremap_cache); static pte_t bm_pte[PTRS_PER_PTE] __page_aligned_bss; #if CONFIG_ARM64_PGTABLE_LEVELS > 2 -static pte_t bm_pmd[PTRS_PER_PMD] __page_aligned_bss; +static pmd_t bm_pmd[PTRS_PER_PMD] __page_aligned_bss; #endif #if CONFIG_ARM64_PGTABLE_LEVELS > 3 -static pte_t bm_pud[PTRS_PER_PUD] __page_aligned_bss; +static pud_t bm_pud[PTRS_PER_PUD] __page_aligned_bss; #endif static inline pud_t * __init early_ioremap_pud(unsigned long addr)