From: ira.weiny@intel.com
To: linux-kernel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
Christian Koenig <christian.koenig@amd.com>,
Huang Rui <ray.huang@amd.com>
Cc: Ira Weiny <ira.weiny@intel.com>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>,
Helge Deller <deller@gmx.de>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
"David S. Miller" <davem@davemloft.net>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
Andy Lutomirski <luto@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Chris Zankel <chris@zankel.net>,
Max Filippov <jcmvbkbc@gmail.com>,
Dan Williams <dan.j.williams@intel.com>,
linux-snps-arc@lists.infradead.org,
linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org,
linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org,
linuxppc-dev@lists.ozlabs.org, sparclinux@vger.kernel.org,
linux-xtensa@linux-xtensa.org, dri-devel@lists.freedesktop.org
Subject: [PATCH V1 02/10] arch/xtensa: Move kmap build bug out of the way
Date: Thu, 30 Apr 2020 13:38:37 -0700 [thread overview]
Message-ID: <20200430203845.582900-3-ira.weiny@intel.com> (raw)
In-Reply-To: <20200430203845.582900-1-ira.weiny@intel.com>
From: Ira Weiny <ira.weiny@intel.com>
Move the kmap() build bug to kmap_init() to facilitate patches to lift
kmap() to the core.
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
arch/xtensa/include/asm/highmem.h | 5 -----
arch/xtensa/mm/highmem.c | 5 +++++
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/xtensa/include/asm/highmem.h b/arch/xtensa/include/asm/highmem.h
index 413848cc1e56..a9587c85be85 100644
--- a/arch/xtensa/include/asm/highmem.h
+++ b/arch/xtensa/include/asm/highmem.h
@@ -68,11 +68,6 @@ void kunmap_high(struct page *page);
static inline void *kmap(struct page *page)
{
- /* Check if this memory layout is broken because PKMAP overlaps
- * page table.
- */
- BUILD_BUG_ON(PKMAP_BASE <
- TLBTEMP_BASE_1 + TLBTEMP_SIZE);
might_sleep();
if (!PageHighMem(page))
return page_address(page);
diff --git a/arch/xtensa/mm/highmem.c b/arch/xtensa/mm/highmem.c
index 184ceadccc1a..711641c4d214 100644
--- a/arch/xtensa/mm/highmem.c
+++ b/arch/xtensa/mm/highmem.c
@@ -88,6 +88,11 @@ void __init kmap_init(void)
{
unsigned long kmap_vstart;
+ /* Check if this memory layout is broken because PKMAP overlaps
+ * page table.
+ */
+ BUILD_BUG_ON(PKMAP_BASE <
+ TLBTEMP_BASE_1 + TLBTEMP_SIZE);
/* cache the first kmap pte */
kmap_vstart = __fix_to_virt(FIX_KMAP_BEGIN);
kmap_pte = kmap_get_fixmap_pte(kmap_vstart);
--
2.25.1
next prev parent reply other threads:[~2020-04-30 20:39 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-30 20:38 [PATCH V1 00/10] Remove duplicated kmap code ira.weiny
2020-04-30 20:38 ` [PATCH V1 01/10] arch/kmap: Remove BUG_ON() ira.weiny
2020-05-01 8:35 ` Christoph Hellwig
2020-04-30 20:38 ` ira.weiny [this message]
2020-05-01 8:36 ` [PATCH V1 02/10] arch/xtensa: Move kmap build bug out of the way Christoph Hellwig
2020-04-30 20:38 ` [PATCH V1 03/10] arch/kmap: Remove redundant arch specific kmaps ira.weiny
2020-05-01 8:37 ` Christoph Hellwig
2020-04-30 20:38 ` [PATCH V1 04/10] arch/kunmap: Remove duplicate kunmap implementations ira.weiny
2020-05-01 8:38 ` Christoph Hellwig
2020-04-30 20:38 ` [PATCH V1 05/10] arch/kmap_atomic: Consolidate duplicate code ira.weiny
2020-05-01 2:09 ` Al Viro
2020-05-01 8:39 ` Christoph Hellwig
2020-04-30 20:38 ` [PATCH V1 06/10] arch/kunmap_atomic: " ira.weiny
2020-05-01 8:39 ` Christoph Hellwig
2020-04-30 20:38 ` [PATCH V1 07/10] arch/kmap: Ensure kmap_prot visibility ira.weiny
2020-05-01 8:44 ` sparc-related comment, to " Christoph Hellwig
2020-05-01 15:35 ` Ira Weiny
2020-04-30 20:38 ` [PATCH V1 08/10] arch/kmap: Don't hard code kmap_prot values ira.weiny
2020-05-01 2:16 ` Al Viro
2020-05-01 8:47 ` Christoph Hellwig
2020-04-30 20:38 ` [PATCH V1 09/10] arch/kmap: Define kmap_atomic_prot() for all arch's ira.weiny
2020-05-01 2:37 ` Al Viro
2020-05-01 3:20 ` Al Viro
2020-05-03 3:11 ` Ira Weiny
2020-05-01 8:48 ` Christoph Hellwig
2020-04-30 20:38 ` [PATCH V1 10/10] drm: Remove drm specific kmap_atomic code ira.weiny
2020-05-01 7:23 ` Christian König
2020-05-01 8:49 ` Christoph Hellwig
2020-05-01 2:29 ` [PATCH V1 00/10] Remove duplicated kmap code Michael Ellerman
2020-05-01 8:54 ` Christoph Hellwig
2020-05-01 17:18 ` Ira Weiny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200430203845.582900-3-ira.weiny@intel.com \
--to=ira.weiny@intel.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=akpm@linux-foundation.org \
--cc=benh@kernel.crashing.org \
--cc=bp@alien8.de \
--cc=chris@zankel.net \
--cc=christian.koenig@amd.com \
--cc=dan.j.williams@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=davem@davemloft.net \
--cc=deller@gmx.de \
--cc=dri-devel@lists.freedesktop.org \
--cc=hpa@zytor.com \
--cc=jcmvbkbc@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-csky@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-snps-arc@lists.infradead.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=paulus@samba.org \
--cc=peterz@infradead.org \
--cc=ray.huang@amd.com \
--cc=sparclinux@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=tsbogend@alpha.franken.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).