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: 5097981 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3E4AF9F30B for ; Fri, 17 Oct 2014 14:30:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6049C201CD for ; Fri, 17 Oct 2014 14:30:17 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8673720125 for ; Fri, 17 Oct 2014 14:30:16 +0000 (UTC) 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-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:mime-version :content-type:content-transfer-encoding; bh=YU0tzr9VpZHSWw9Z0XaWhWeQLc97+LWzN+dJHhflm+Y=; b=VnKdNmvDQyBMiP0i34Spm7wMafLkgMO3gdubUJauq+13IdsRkwQgpOAwY4eqYuVR7g hCdEHW2BpZ+G42qBMhpYqhOq1FSAz/apHEDEK7M8oNKhFpxqpczv37A6wVDNdV9dCZXO hk+JYnOhRwASo7cYPXh/gG7zMkZcfo93jH0Qj52yqHSE64Z84E4i285sHMN4SvgFYh5i qmocwCJpsEfDVTQYOuELaLmteCXRWKBfXgP5FCCR+Ec6Gziz4SqZ70ttTFp0SV6xAoYI qUImPJexQ/Vmm9wvSQ/JOhbeQwoVRZPz8NSUZNtIhe6l7F8QtRHzCRA+pOZyWOHAFPcc V9BA== X-Gm-Message-State: ALoCoQlSbf0Ff4bD3aZSMXUr/4iXnwKzHC15TMyZtUDmZs0tdQvLvvdIB8w2wrnKv78ssg40OyQ5 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 (/) 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+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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)