arch-kmap-remove-redundant-arch-specific-kmaps.patch removed from -mm tree
The patch titled
Subject: arch/kmap: remove redundant arch specific kmaps
has been removed from the -mm tree. Its filename was
arch-kmap-remove-redundant-arch-specific-kmaps.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Ira Weiny <[email protected]>
Subject: arch/kmap: remove redundant arch specific kmaps
The kmap code for all the architectures is almost 100% identical.
Lift the common code to the core. Use ARCH_HAS_KMAP_FLUSH_TLB to indicate if an arch defines kmap_flush_tlb() and call if if needed.
This also has the benefit of changing kmap() on a number of architectures to be an inline call rather than an actual function.
---
arch/arc/include/asm/highmem.h | 2 -- arch/arc/mm/highmem.c | 10 ---------- arch/arm/include/asm/highmem.h | 2 -- arch/arm/mm/highmem.c | 9 --------- arch/csky/include/asm/highmem.h | 4 ++-- arch/csky/mm/highmem.c | 14 ++++---------- arch/microblaze/include/asm/highmem.h | 9 --------- arch/mips/include/asm/highmem.h | 4 ++-- arch/mips/mm/highmem.c | 14 +++----------- arch/nds32/include/asm/highmem.h | 2 -- arch/nds32/mm/highmem.c | 12 ------------ arch/powerpc/include/asm/highmem.h | 9 --------- arch/sparc/include/asm/highmem.h | 9 --------- arch/x86/include/asm/highmem.h | 2 -- arch/x86/mm/highmem_32.c | 9 --------- arch/xtensa/include/asm/highmem.h | 9 --------- include/linux/highmem.h | 18 ++++++++++++++++++ 17 files changed, 29 insertions(+), 109 deletions(-)
arch/arc/include/asm/highmem.h renamed from arch/arc/include/asm/highmem.h~arch-kmap-remove-redundant-arch-specific-kmaps +0 -2
@@ -30,8 +30,6 @@#include <asm/cacheflush.h> -extern void *kmap (struct page *page); -extern void *kmap_high (struct page *page);extern void *kmap_atomic (struct page *page);extern void __kunmap_atomic (void *kvaddr);extern void kunmap_high (struct page *page);
arch/arc/mm/highmem.c renamed from arch/arc/mm/highmem.c~arch-kmap-remove-redundant-arch-specific-kmaps +0 -10
@@ -49,16 +49,6 @@extern pte_t * pkmap_page_table;static pte_t * fixmap_page_table; -void *kmap (struct page *page) -{ -might_sleep (); -if (!PageHighMem (page)) -return page_address (page); - -return kmap_high (page); -} -EXPORT_SYMBOL (kmap); -void *kmap_atomic (struct page *page) {int idx, cpu_idx;
arch/arm/include/asm/highmem.h renamed from arch/arm/include/asm/highmem.h~arch-kmap-remove-redundant-arch-specific-kmaps +0 -2
@@ -20,7 +20,6 @@extern pte_t *pkmap_page_table; -extern void *kmap_high (struct page *page);extern void kunmap_high (struct page *page);/*
@@ -63,7 +62,6 @@ static inline void *kmap_high_get(struct* when CONFIG_HIGHMEM is not set. */ #ifdef CONFIG_HIGHMEM -extern void *kmap (struct page *page);extern void kunmap (struct page *page);extern void *kmap_atomic (struct page *page);extern void __kunmap_atomic (void *kvaddr);
arch/arm/mm/highmem.c renamed from arch/arm/mm/highmem.c~arch-kmap-remove-redundant-arch-specific-kmaps +0 -9
@@ -31,15 +31,6 @@ static inline pte_t get_fixmap_pte(unsigreturn *ptep; } -void *kmap (struct page *page) -{ -might_sleep (); -if (!PageHighMem (page)) -return page_address (page); -return kmap_high (page); -} -EXPORT_SYMBOL (kmap); -void kunmap (struct page *page) {might_sleep ();
arch/csky/include/asm/highmem.h renamed from arch/csky/include/asm/highmem.h~arch-kmap-remove-redundant-arch-specific-kmaps +2 -2
@@ -30,10 +30,10 @@ extern pte_t *pkmap_page_table;#define PKMAP_NR (virt) ((virt-PKMAP_BASE) >> PAGE_SHIFT)#define PKMAP_ADDR (nr) (PKMAP_BASE + ((nr) << PAGE_SHIFT)) -extern void *kmap_high (struct page *page);extern void kunmap_high (struct page *page); -extern void *kmap (struct page *page); +#define ARCH_HAS_KMAP_FLUSH_TLB +extern void kmap_flush_tlb (unsigned long addr);extern void kunmap (struct page *page);extern void *kmap_atomic (struct page *page);extern void __kunmap_atomic (void *kvaddr);
arch/csky/mm/highmem.c renamed from arch/csky/mm/highmem.c~arch-kmap-remove-redundant-arch-specific-kmaps +4 -10
@@ -13,18 +13,12 @@ static pte_t *kmap_pte;unsigned long highstart_pfn, highend_pfn; -void *kmap (struct page *page) +void kmap_flush_tlb (unsigned long addr) { -void *addr; - -might_sleep (); -if (!PageHighMem (page)) -return page_address (page); - addr =kmap_high (page); -flush_tlb_one ((unsigned long )addr); - -return addr; +flush_tlb_one (addr); } +EXPORT_SYMBOL (kmap_flush_tlb); +EXPORT_SYMBOL (kmap);void kunmap (struct page *page)
arch/microblaze/include/asm/highmem.h renamed from arch/microblaze/include/asm/highmem.h~arch-kmap-remove-redundant-arch-specific-kmaps +0 -9
@@ -51,19 +51,10 @@ extern pte_t *pkmap_page_table;#define PKMAP_NR (virt) ((virt - PKMAP_BASE) >> PAGE_SHIFT)#define PKMAP_ADDR (nr) (PKMAP_BASE + ((nr) << PAGE_SHIFT)) -extern void *kmap_high (struct page *page);extern void kunmap_high (struct page *page);extern void *kmap_atomic_prot (struct page *page,pgprot_t prot);extern void __kunmap_atomic (void *kvaddr); -static inline void *kmap (struct page *page) -{ -might_sleep (); -if (!PageHighMem (page)) -return page_address (page); -return kmap_high (page); -} -static inline void kunmap (struct page *page) {might_sleep ();
arch/mips/include/asm/highmem.h renamed from arch/mips/include/asm/highmem.h~arch-kmap-remove-redundant-arch-specific-kmaps +2 -2
@@ -46,10 +46,10 @@ extern pte_t *pkmap_page_table;#define PKMAP_NR (virt) ((virt-PKMAP_BASE) >> PAGE_SHIFT)#define PKMAP_ADDR (nr) (PKMAP_BASE + ((nr) << PAGE_SHIFT)) -extern void *kmap_high (struct page *page);extern void kunmap_high (struct page *page); -extern void *kmap (struct page *page); +#define ARCH_HAS_KMAP_FLUSH_TLB +extern void kmap_flush_tlb (unsigned long addr);extern void kunmap (struct page *page);extern void *kmap_atomic (struct page *page);extern void __kunmap_atomic (void *kvaddr);
arch/mips/mm/highmem.c renamed from arch/mips/mm/highmem.c~arch-kmap-remove-redundant-arch-specific-kmaps +3 -11
@@ -12,19 +12,11 @@ static pte_t *kmap_pte;unsigned long highstart_pfn, highend_pfn; -void *kmap (struct page *page) +void kmap_flush_tlb (unsigned long addr) { -void *addr; - -might_sleep (); -if (!PageHighMem (page)) -return page_address (page); - addr =kmap_high (page); -flush_tlb_one ((unsigned long )addr); - -return addr; +flush_tlb_one (addr); } -EXPORT_SYMBOL (kmap); +EXPORT_SYMBOL (kmap_flush_tlb);void kunmap (struct page *page) {
arch/nds32/include/asm/highmem.h renamed from arch/nds32/include/asm/highmem.h~arch-kmap-remove-redundant-arch-specific-kmaps +0 -2
@@ -44,7 +44,6 @@ extern unsigned long highstart_pfn, highextern pte_t *pkmap_page_table; -extern void *kmap_high (struct page *page);extern void kunmap_high (struct page *page);extern void kmap_init (void );
@@ -54,7 +53,6 @@ extern void kmap_init(void);* when CONFIG_HIGHMEM is not set. */ #ifdef CONFIG_HIGHMEM -extern void *kmap (struct page *page);extern void kunmap (struct page *page);extern void *kmap_atomic (struct page *page);extern void __kunmap_atomic (void *kvaddr);
arch/nds32/mm/highmem.c renamed from arch/nds32/mm/highmem.c~arch-kmap-remove-redundant-arch-specific-kmaps +0 -12
@@ -10,18 +10,6 @@#include <asm/fixmap.h> #include <asm/tlbflush.h> -void *kmap (struct page *page) -{ -unsigned long vaddr; -might_sleep (); -if (!PageHighMem (page)) -return page_address (page); - vaddr = (unsigned long )kmap_high (page); -return (void *)vaddr; -} - -EXPORT_SYMBOL (kmap); -void kunmap (struct page *page) {might_sleep ();
arch/powerpc/include/asm/highmem.h renamed from arch/powerpc/include/asm/highmem.h~arch-kmap-remove-redundant-arch-specific-kmaps +0 -9
@@ -59,19 +59,10 @@ extern pte_t *pkmap_page_table;#define PKMAP_NR (virt) ((virt-PKMAP_BASE) >> PAGE_SHIFT)#define PKMAP_ADDR (nr) (PKMAP_BASE + ((nr) << PAGE_SHIFT)) -extern void *kmap_high (struct page *page);extern void kunmap_high (struct page *page);extern void *kmap_atomic_prot (struct page *page,pgprot_t prot);extern void __kunmap_atomic (void *kvaddr); -static inline void *kmap (struct page *page) -{ -might_sleep (); -if (!PageHighMem (page)) -return page_address (page); -return kmap_high (page); -} -static inline void kunmap (struct page *page) {might_sleep ();
arch/sparc/include/asm/highmem.h renamed from arch/sparc/include/asm/highmem.h~arch-kmap-remove-redundant-arch-specific-kmaps +0 -9
@@ -50,17 +50,8 @@ void kmap_init(void) __init;#define PKMAP_END (PKMAP_ADDR(LAST_PKMAP)) -void *kmap_high (struct page *page);void kunmap_high (struct page *page); -static inline void *kmap (struct page *page) -{ -might_sleep (); -if (!PageHighMem (page)) -return page_address (page); -return kmap_high (page); -} -static inline void kunmap (struct page *page) {might_sleep ();
arch/x86/include/asm/highmem.h renamed from arch/x86/include/asm/highmem.h~arch-kmap-remove-redundant-arch-specific-kmaps +0 -2
@@ -58,10 +58,8 @@ extern unsigned long highstart_pfn, high#define PKMAP_NR (virt) ((virt-PKMAP_BASE) >> PAGE_SHIFT)#define PKMAP_ADDR (nr) (PKMAP_BASE + ((nr) << PAGE_SHIFT)) -extern void *kmap_high (struct page *page);extern void kunmap_high (struct page *page); -void *kmap (struct page *page);void kunmap (struct page *page);void *kmap_atomic_prot (struct page *page,pgprot_t prot);
arch/x86/mm/highmem_32.c renamed from arch/x86/mm/highmem_32.c~arch-kmap-remove-redundant-arch-specific-kmaps +0 -9
@@ -4,15 +4,6 @@#include <linux/swap.h> /* for totalram_pages */ #include <linux/memblock.h> -void *kmap (struct page *page) -{ -might_sleep (); -if (!PageHighMem (page)) -return page_address (page); -return kmap_high (page); -} -EXPORT_SYMBOL (kmap); -void kunmap (struct page *page) {might_sleep ();
arch/xtensa/include/asm/highmem.h renamed from arch/xtensa/include/asm/highmem.h~arch-kmap-remove-redundant-arch-specific-kmaps +0 -9
@@ -63,17 +63,8 @@ static inline wait_queue_head_t *get_pkmextern pte_t *pkmap_page_table; -void *kmap_high (struct page *page);void kunmap_high (struct page *page); -static inline void *kmap (struct page *page) -{ -might_sleep (); -if (!PageHighMem (page)) -return page_address (page); -return kmap_high (page); -} -static inline void kunmap (struct page *page) {might_sleep ();
include/linux/highmem.h renamed from include/linux/highmem.h~arch-kmap-remove-redundant-arch-specific-kmaps +18 -0
@@ -34,6 +34,24 @@ static inline void invalidate_kernel_vma#ifdef CONFIG_HIGHMEM #include <asm/highmem.h> +#ifndef ARCH_HAS_KMAP_FLUSH_TLB +static inline void kmap_flush_tlb (unsigned long addr) { } +#endif + +void *kmap_high (struct page *page); +static inline void *kmap (struct page *page) +{ +void *addr; + +might_sleep (); +if (!PageHighMem (page)) + addr =page_address (page); +else + addr =kmap_high (page); +kmap_flush_tlb ((unsigned long )addr); +return addr; +} +/* declarations for linux/mm/highmem.c */ unsigned int nr_free_highpages (void );extern atomic_long_t _totalhigh_pages;
_
Patches currently in -mm which might be from [email protected] are