Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a5a03a3 authored by Ira Weiny's avatar Ira Weiny Committed by Bernhard Thoben
Browse files

arch/kmap_atomic: consolidate duplicate code 



Every arch has the same code to ensure atomic operations and a check for
!HIGHMEM page.

Remove the duplicate code by defining a core kmap_atomic() which only
calls the arch specific kmap_atomic_high() when the page is high memory.

[akpm@linux-foundation.org: coding style fixes]
Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Christian König <christian.koenig@amd.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Helge Deller <deller@gmx.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20200507150004.1423069-7-ira.weiny@intel.com


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 78b6d91ec7bbfc5bcc2dd05bb2cf13c9de1dc7cd)
parent f31ce0b3

arch/arm/include/asm/highmem.h

+0 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ static inline void *kmap_high_get(struct page *page) 
 * when CONFIG_HIGHMEM is not set.

 */

#ifdef CONFIG_HIGHMEM

extern void *kmap_atomic(struct page *page);

extern void __kunmap_atomic(void *kvaddr);

extern void *kmap_atomic_pfn(unsigned long pfn);

extern struct page *kmap_atomic_to_page(const void *ptr);

arch/arm/mm/highmem.c

+2 −7
Original line number Diff line number Diff line
@@ -19,18 +19,13 @@ 
#include <asm/tlbflush.h>

#include "mm.h"



void *kmap_atomic(struct page *page)

void *kmap_atomic_high(struct page *page)

{

	unsigned int idx;

	unsigned long vaddr;

	void *kmap;

	int type;



	preempt_disable();

	pagefault_disable();

	if (!PageHighMem(page))

		return page_address(page);



#ifdef CONFIG_DEBUG_HIGHMEM

	/*

	 * There is no cache coherency issue when non VIVT, so force the
@@ -64,7 +59,7 @@ void *kmap_atomic(struct page *page) 


	return (void *)vaddr;

}

EXPORT_SYMBOL(kmap_atomic);

EXPORT_SYMBOL(kmap_atomic_high);



void __kunmap_atomic(void *kvaddr)

{

arch/microblaze/include/asm/highmem.h

+2 −2
Original line number Diff line number Diff line
@@ -53,9 +53,9 @@ extern pte_t *pkmap_page_table; 
extern void *kmap_atomic_prot(struct page *page, pgprot_t prot);

extern void __kunmap_atomic(void *kvaddr);



static inline void *kmap_atomic(struct page *page)

static inline void *kmap_atomic_high(struct page *page)

{

	return kmap_atomic_prot(page, kmap_prot);

	return kmap_atomic_high_prot(page, kmap_prot);

}



static inline struct page *kmap_atomic_to_page(void *ptr)

arch/mips/include/asm/highmem.h

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ extern pte_t *pkmap_page_table; 


#define ARCH_HAS_KMAP_FLUSH_TLB

extern void kmap_flush_tlb(unsigned long addr);

extern void *kmap_atomic(struct page *page);

extern void __kunmap_atomic(void *kvaddr);

extern void *kmap_atomic_pfn(unsigned long pfn);

extern struct page *kmap_atomic_to_page(void *ptr);

arch/mips/mm/cache.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/sched.h>

#include <linux/syscalls.h>

#include <linux/mm.h>

#include <linux/highmem.h>



#include <asm/cacheflush.h>

#include <asm/processor.h>