From patchwork Fri Feb 26 08:51:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 62971 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp595818lbc; Fri, 26 Feb 2016 00:53:25 -0800 (PST) X-Received: by 10.66.222.129 with SMTP id qm1mr520374pac.22.1456476805057; Fri, 26 Feb 2016 00:53:25 -0800 (PST) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id 29si18595649pft.41.2016.02.26.00.53.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Feb 2016 00:53:25 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org; dkim=neutral (body hash did not verify) header.i=@linaro.org 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 1aZE8S-0004Gv-CS; Fri, 26 Feb 2016 08:52:28 +0000 Received: from mail-io0-x22b.google.com ([2607:f8b0:4001:c06::22b]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aZE86-0003di-Aq for linux-arm-kernel@lists.infradead.org; Fri, 26 Feb 2016 08:52:07 +0000 Received: by mail-io0-x22b.google.com with SMTP id z135so116530138iof.0 for ; Fri, 26 Feb 2016 00:51:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:date:message-id:subject:from:to; bh=LRAe1EKhgfGrxBYT9ne4S926inQSuIRXuUZvNfxMuWE=; b=VI73j0uuQFwEkM2/Q0KXgERZvne99Nzw0zCT5TBE/Lio13I1qQhpz+YkdM6hMqdZdq AaXVWGphjWXXuXwGBOU13P+t6NNd2Z7NbOqV4Yfc4Of98J4Z/9E7lKwHEAWzPXuomkLV LXMm0eqq/moFPiDXClSqdKnvFOgzg49q4hNp8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:date:message-id:subject:from:to; bh=LRAe1EKhgfGrxBYT9ne4S926inQSuIRXuUZvNfxMuWE=; b=Fg41MJQ3UE1OzHvsXOWj5hFDy9lVwcQgPV7sGYxbKzhwy6QAawEAAaW7XNRcP/eaC/ lXh7j9+rg2S/DqdFap4hCWxaSoTljHHsrysq7zM6xMJ06WA6BgALnY5jPKjUlMeYtMRR jxc7IrBnWbwNzxEF91xfWCwuAjPihMwvph/tyF2GzFZjwpizy2du67uB4Xy6bezdsEFQ 59a/b5HhB1b5xyA0So4A7krQebDViWEwaKQ8FXOIggPjZQIhUrIpuiHSb+GxFUVPSwTt quI5PtlHiNxlZ9J4u0qwEnmocZlQqDZ9kNmEDrIzXS/JtT71jil1Q0hsFPAE/EGvyXnd eLiQ== X-Gm-Message-State: AG10YOTCh9vZasZzo+eONIB3tPLB8vsbBHEoGWcAxOTjLBSX5AVF0xSdRLV1vwhHPQCnygOWtkNdZ1qG8PPwS4fW MIME-Version: 1.0 X-Received: by 10.107.40.11 with SMTP id o11mr6797186ioo.183.1456476705227; Fri, 26 Feb 2016 00:51:45 -0800 (PST) Received: by 10.36.29.6 with HTTP; Fri, 26 Feb 2016 00:51:45 -0800 (PST) Date: Fri, 26 Feb 2016 09:51:45 +0100 Message-ID: Subject: arm64 defconfig currently broken in -next From: Ard Biesheuvel To: "linux-arm-kernel@lists.infradead.org" , Catalin Marinas , Will Deacon , Mark Rutland X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160226_005206_728927_7E60EB9B X-CRM114-Status: UNSURE ( 8.50 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 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 arm64 defconfig is currently broken in -next, due to the way early_memremap_ro() is compiled conditionally, based on a condition that incorrectly resolves to false due to the inclusion order of various header files This fixes it for me _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 16438dd..c6ede6d 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -49,16 +49,6 @@ #define FIRST_USER_ADDRESS 0UL -#ifndef __ASSEMBLY__ - -#include -#include - -extern void __pte_error(const char *file, int line, unsigned long val); -extern void __pmd_error(const char *file, int line, unsigned long val); -extern void __pud_error(const char *file, int line, unsigned long val); -extern void __pgd_error(const char *file, int line, unsigned long val); - #define PROT_DEFAULT (PTE_TYPE_PAGE | PTE_AF | PTE_SHARED) #define PROT_SECT_DEFAULT (PMD_TYPE_SECT | PMD_SECT_AF | PMD_SECT_S) @@ -112,6 +102,16 @@ #define __S110 PAGE_SHARED_EXEC #define __S111 PAGE_SHARED_EXEC +#ifndef __ASSEMBLY__ + +#include +#include + +extern void __pte_error(const char *file, int line, unsigned long val); +extern void __pmd_error(const char *file, int line, unsigned long val); +extern void __pud_error(const char *file, int line, unsigned long val); +extern void __pgd_error(const char *file, int line, unsigned long val); + /* * ZERO_PAGE is a global shared page that is always zero: used * for zero-mapped memory areas etc..