arch-xtensa-move-kmap-build-bug-out-of-the-way.patch removed from -mm tree
The patch titled
Subject: arch/xtensa: move kmap build bug out of the way
has been removed from the -mm tree. Its filename was
arch-xtensa-move-kmap-build-bug-out-of-the-way.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Ira Weiny <[email protected]>
Subject: arch/xtensa: move kmap build bug out of the way
Move the kmap() build bug to kmap_init() to facilitate patches to lift kmap() to the core.
Signed-off-by Ira Weiny <[email protected]>
Reviewed-by Christoph Hellwig <[email protected]>
Cc Al Viro <[email protected]>
Cc Andy Lutomirski <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Christian König <[email protected]>
Cc Chris Zankel <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Dan Williams <[email protected]>
Cc Dave Hansen <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Helge Deller <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc "James E.J. Bottomley" <[email protected]>
Cc Max Filippov <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Thomas Bogendoerfer <[email protected]>
Cc Thomas Gleixner <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/xtensa/include/asm/highmem.h | 5 ----- arch/xtensa/mm/highmem.c | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-)
arch/xtensa/include/asm/highmem.h renamed from arch/xtensa/include/asm/highmem.h~arch-xtensa-move-kmap-build-bug-out-of-the-way +0 -5
@@ -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);
arch/xtensa/mm/highmem.c renamed from arch/xtensa/mm/highmem.c~arch-xtensa-move-kmap-build-bug-out-of-the-way +4 -0
@@ -88,6 +88,10 @@ 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);
_
Patches currently in -mm which might be from [email protected] are