From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23ED3C433E0 for ; Thu, 4 Jun 2020 23:47:54 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D6B27206A2 for ; Thu, 4 Jun 2020 23:47:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="oqgTUzHc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D6B27206A2 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 80B0828001E; Thu, 4 Jun 2020 19:47:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7E28F280005; Thu, 4 Jun 2020 19:47:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 71FAE28001E; Thu, 4 Jun 2020 19:47:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0183.hostedemail.com [216.40.44.183]) by kanga.kvack.org (Postfix) with ESMTP id 5A273280005 for ; Thu, 4 Jun 2020 19:47:53 -0400 (EDT) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 2DA303752 for ; Thu, 4 Jun 2020 23:47:53 +0000 (UTC) X-FDA: 76893169626.23.gate57_02115fe26d9b Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin23.hostedemail.com (Postfix) with ESMTP id 0D0C937604 for ; Thu, 4 Jun 2020 23:47:53 +0000 (UTC) X-HE-Tag: gate57_02115fe26d9b X-Filterd-Recvd-Size: 5700 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf01.hostedemail.com (Postfix) with ESMTP for ; Thu, 4 Jun 2020 23:47:52 +0000 (UTC) Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6CE4120878; Thu, 4 Jun 2020 23:47:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591314471; bh=I8LUBqKzja+IUq8MYIZlxXybeDHtlFfugZ0YeUPb4p4=; h=Date:From:To:Subject:In-Reply-To:From; b=oqgTUzHc7XU1wqnhbt/wvmDHddB6pMwHRWI3jf4iOx4d8LnzYuZ9AAoJiGDcjp0Qv sc9JplShhrj4fFq1juDv4m3hDbvM2D/5TUF8Sw0PcIEZJbPKAnaapC1rBoTe4+VK0H 2xoazZoGF3/4x6qD33tOspI1tdAUpGNkL2JyrpEs= Date: Thu, 04 Jun 2020 16:47:50 -0700 From: Andrew Morton To: akpm@linux-foundation.org, benh@kernel.crashing.org, bp@alien8.de, chris@zankel.net, christian.koenig@amd.com, dan.j.williams@intel.com, daniel.vetter@ffwll.ch, dave.hansen@linux.intel.com, davem@davemloft.net, deller@gmx.de, hch@lst.de, hpa@zytor.com, ira.weiny@intel.com, James.Bottomley@HansenPartnership.com, jcmvbkbc@gmail.com, linux-mm@kvack.org, luto@kernel.org, mingo@redhat.com, mm-commits@vger.kernel.org, paulus@samba.org, peterz@infradead.org, tglx@linutronix.de, torvalds@linux-foundation.org, tsbogend@alpha.franken.de, viro@zeniv.linux.org.uk Subject: [patch 033/127] arch/kmap: ensure kmap_prot visibility Message-ID: <20200604234750.iRzkiL0L1%akpm@linux-foundation.org> In-Reply-To: <20200604164523.e15f3177f4b69dcb4f2534a1@linux-foundation.org> User-Agent: s-nail v14.8.16 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 0D0C937604 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: =46rom: Ira Weiny Subject: arch/kmap: ensure kmap_prot visibility We want to support kmap_atomic_prot() on all architectures and it makes sense to define kmap_atomic() to use the default kmap_prot. So we ensure all arch's have a globally available kmap_prot either as a define or exported symbol. Link: http://lkml.kernel.org/r/20200507150004.1423069-9-ira.weiny@intel.com Signed-off-by: Ira Weiny Reviewed-by: Christoph Hellwig Cc: Al Viro Cc: Andy Lutomirski Cc: Benjamin Herrenschmidt Cc: Borislav Petkov Cc: Christian K=C3=B6nig Cc: Chris Zankel Cc: Daniel Vetter Cc: Dan Williams Cc: Dave Hansen Cc: "David S. Miller" Cc: Helge Deller Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: "James E.J. Bottomley" Cc: Max Filippov Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Thomas Bogendoerfer Cc: Thomas Gleixner Signed-off-by: Andrew Morton --- arch/microblaze/include/asm/highmem.h | 2 +- arch/microblaze/mm/init.c | 3 --- arch/powerpc/include/asm/highmem.h | 2 +- arch/powerpc/mm/mem.c | 3 --- arch/sparc/mm/highmem.c | 1 + 5 files changed, 3 insertions(+), 8 deletions(-) --- a/arch/microblaze/include/asm/highmem.h~arch-kmap-ensure-kmap_prot-visi= bility +++ a/arch/microblaze/include/asm/highmem.h @@ -25,8 +25,8 @@ #include #include =20 +#define kmap_prot PAGE_KERNEL extern pte_t *kmap_pte; -extern pgprot_t kmap_prot; extern pte_t *pkmap_page_table; =20 /* --- a/arch/microblaze/mm/init.c~arch-kmap-ensure-kmap_prot-visibility +++ a/arch/microblaze/mm/init.c @@ -49,8 +49,6 @@ unsigned long lowmem_size; #ifdef CONFIG_HIGHMEM pte_t *kmap_pte; EXPORT_SYMBOL(kmap_pte); -pgprot_t kmap_prot; -EXPORT_SYMBOL(kmap_prot); =20 static inline pte_t *virt_to_kpte(unsigned long vaddr) { @@ -68,7 +66,6 @@ static void __init highmem_init(void) pkmap_page_table =3D virt_to_kpte(PKMAP_BASE); =20 kmap_pte =3D virt_to_kpte(__fix_to_virt(FIX_KMAP_BEGIN)); - kmap_prot =3D PAGE_KERNEL; } =20 static void highmem_setup(void) --- a/arch/powerpc/include/asm/highmem.h~arch-kmap-ensure-kmap_prot-visibil= ity +++ a/arch/powerpc/include/asm/highmem.h @@ -29,8 +29,8 @@ #include #include =20 +#define kmap_prot PAGE_KERNEL extern pte_t *kmap_pte; -extern pgprot_t kmap_prot; extern pte_t *pkmap_page_table; =20 /* --- a/arch/powerpc/mm/mem.c~arch-kmap-ensure-kmap_prot-visibility +++ a/arch/powerpc/mm/mem.c @@ -64,8 +64,6 @@ bool init_mem_is_free; #ifdef CONFIG_HIGHMEM pte_t *kmap_pte; EXPORT_SYMBOL(kmap_pte); -pgprot_t kmap_prot; -EXPORT_SYMBOL(kmap_prot); #endif =20 pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, @@ -245,7 +243,6 @@ void __init paging_init(void) pkmap_page_table =3D virt_to_kpte(PKMAP_BASE); =20 kmap_pte =3D virt_to_kpte(__fix_to_virt(FIX_KMAP_BEGIN)); - kmap_prot =3D PAGE_KERNEL; #endif /* CONFIG_HIGHMEM */ =20 printk(KERN_DEBUG "Top of RAM: 0x%llx, Total RAM: 0x%llx\n", --- a/arch/sparc/mm/highmem.c~arch-kmap-ensure-kmap_prot-visibility +++ a/arch/sparc/mm/highmem.c @@ -33,6 +33,7 @@ #include =20 pgprot_t kmap_prot; +EXPORT_SYMBOL(kmap_prot); =20 static pte_t *kmap_pte; =20 _