arch-kmap-define-kmap_atomic_prot-for-all-archs.patch removed from -mm tree
The patch titled
Subject: arch/kmap: define kmap_atomic_prot() for all arch's
has been removed from the -mm tree. Its filename was
arch-kmap-define-kmap_atomic_prot-for-all-archs.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Ira Weiny <[email protected]>
Subject: arch/kmap: define kmap_atomic_prot() for all arch's
To support kmap_atomic_prot(), all architectures need to support protections passed to their kmap_atomic_high() function. Pass protections into kmap_atomic_high() and change the name to kmap_atomic_high_prot() to match.
Then define kmap_atomic_prot() as a core function which calls kmap_atomic_high_prot() when needed.
Finally, redefine kmap_atomic() as a wrapper of kmap_atomic_prot() with the default kmap_prot exported by the architectures.
---
arch/arc/mm/highmem.c | 6 +++--- arch/arm/mm/highmem.c | 6 +++--- arch/csky/mm/highmem.c | 6 +++--- arch/microblaze/include/asm/highmem.h | 16 ---------------- arch/mips/mm/highmem.c | 6 +++--- arch/nds32/mm/highmem.c | 6 +++--- arch/powerpc/include/asm/highmem.h | 17 ----------------- arch/sparc/mm/highmem.c | 6 +++--- arch/x86/include/asm/highmem.h | 14 -------------- arch/xtensa/mm/highmem.c | 6 +++--- include/linux/highmem.h | 7 ++++--- 11 files changed, 25 insertions(+), 71 deletions(-)
arch/arc/mm/highmem.c renamed from arch/arc/mm/highmem.c~arch-kmap-define-kmap_atomic_prot-for-all-archs +3 -3
@@ -49,7 +49,7 @@extern pte_t * pkmap_page_table;static pte_t * fixmap_page_table; -void *kmap_atomic_high (struct page *page) +void *kmap_atomic_high_prot (struct page *page,pgprot_t prot) {int idx, cpu_idx;unsigned long vaddr;
@@ -59,11 +59,11 @@ void *kmap_atomic_high(struct page *page vaddr =FIXMAP_ADDR (idx);set_pte_at (&init_mm, vaddr, fixmap_page_table + idx, -mk_pte (page, kmap_prot)); +mk_pte (page, prot));return (void *)vaddr; } -EXPORT_SYMBOL (kmap_atomic_high); +EXPORT_SYMBOL (kmap_atomic_high_prot);void kunmap_atomic_high (void *kv) {
arch/arm/mm/highmem.c renamed from arch/arm/mm/highmem.c~arch-kmap-define-kmap_atomic_prot-for-all-archs +3 -3
@@ -31,7 +31,7 @@ static inline pte_t get_fixmap_pte(unsigreturn *ptep; } -void *kmap_atomic_high (struct page *page) +void *kmap_atomic_high_prot (struct page *page,pgprot_t prot) {unsigned int idx;unsigned long vaddr;
@@ -67,11 +67,11 @@ void *kmap_atomic_high(struct page *page* in place, so the contained TLB flush ensures the TLB is updated * with the new mapping. */ -set_fixmap_pte (idx,mk_pte (page, kmap_prot)); +set_fixmap_pte (idx,mk_pte (page, prot));return (void *)vaddr; } -EXPORT_SYMBOL (kmap_atomic_high); +EXPORT_SYMBOL (kmap_atomic_high_prot);void kunmap_atomic_high (void *kvaddr) {
arch/csky/mm/highmem.c renamed from arch/csky/mm/highmem.c~arch-kmap-define-kmap_atomic_prot-for-all-archs +3 -3
@@ -21,7 +21,7 @@ EXPORT_SYMBOL(kmap_flush_tlb);EXPORT_SYMBOL (kmap); -void *kmap_atomic_high (struct page *page) +void *kmap_atomic_high_prot (struct page *page,pgprot_t prot) {unsigned long vaddr;int idx, type;
@@ -32,12 +32,12 @@ void *kmap_atomic_high(struct page *page#ifdef CONFIG_DEBUG_HIGHMEM BUG_ON (!pte_none (*(kmap_pte - idx)));#endif -set_pte (kmap_pte-idx,mk_pte (page, kmap_prot)); +set_pte (kmap_pte-idx,mk_pte (page, prot));flush_tlb_one ((unsigned long )vaddr);return (void *)vaddr; } -EXPORT_SYMBOL (kmap_atomic_high); +EXPORT_SYMBOL (kmap_atomic_high_prot);void kunmap_atomic_high (void *kvaddr) {
arch/microblaze/include/asm/highmem.h renamed from arch/microblaze/include/asm/highmem.h~arch-kmap-define-kmap_atomic_prot-for-all-archs +0 -16
@@ -51,22 +51,6 @@ 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_atomic_high_prot (struct page *page,pgprot_t prot); -static inline void *kmap_atomic_prot (struct page *page,pgprot_t prot) -{ -preempt_disable (); -pagefault_disable (); -if (!PageHighMem (page)) -return page_address (page); - -return kmap_atomic_high_prot (page, prot); -} - -static inline void *kmap_atomic_high (struct page *page) -{ -return kmap_atomic_high_prot (page, kmap_prot); -} -#define flush_cache_kmaps () { flush_icache(); flush_dcache(); }#endif /* __KERNEL__ */
arch/mips/mm/highmem.c renamed from arch/mips/mm/highmem.c~arch-kmap-define-kmap_atomic_prot-for-all-archs +3 -3
@@ -18,7 +18,7 @@ void kmap_flush_tlb(unsigned long addr) }EXPORT_SYMBOL (kmap_flush_tlb); -void *kmap_atomic_high (struct page *page) +void *kmap_atomic_high_prot (struct page *page,pgprot_t prot) {unsigned long vaddr;int idx, type;
@@ -29,12 +29,12 @@ void *kmap_atomic_high(struct page *page#ifdef CONFIG_DEBUG_HIGHMEM BUG_ON (!pte_none (*(kmap_pte - idx)));#endif -set_pte (kmap_pte-idx,mk_pte (page, kmap_prot)); +set_pte (kmap_pte-idx,mk_pte (page, prot));local_flush_tlb_one ((unsigned long )vaddr);return (void *) vaddr; } -EXPORT_SYMBOL (kmap_atomic_high); +EXPORT_SYMBOL (kmap_atomic_high_prot);void kunmap_atomic_high (void *kvaddr) {
arch/nds32/mm/highmem.c renamed from arch/nds32/mm/highmem.c~arch-kmap-define-kmap_atomic_prot-for-all-archs +3 -3
@@ -10,7 +10,7 @@#include <asm/fixmap.h> #include <asm/tlbflush.h> -void *kmap_atomic_high (struct page *page) +void *kmap_atomic_high_prot (struct page *page,pgprot_t prot) {unsigned int idx;unsigned long vaddr, pte;
@@ -21,7 +21,7 @@ void *kmap_atomic_high(struct page *page idx = type +KM_TYPE_NR *smp_processor_id (); vaddr =__fix_to_virt (FIX_KMAP_BEGIN + idx); - pte = (page_to_pfn (page) <<PAGE_SHIFT ) | (kmap_prot); + pte = (page_to_pfn (page) <<PAGE_SHIFT ) | prot; ptep =pte_offset_kernel (pmd_off_k (vaddr), vaddr);set_pte (ptep, pte);
@@ -31,7 +31,7 @@ void *kmap_atomic_high(struct page *page__nds32__isb ();return (void *)vaddr; } -EXPORT_SYMBOL (kmap_atomic_high); +EXPORT_SYMBOL (kmap_atomic_high_prot);void kunmap_atomic_high (void *kvaddr) {
arch/powerpc/include/asm/highmem.h renamed from arch/powerpc/include/asm/highmem.h~arch-kmap-define-kmap_atomic_prot-for-all-archs +0 -17
@@ -59,23 +59,6 @@ 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_atomic_high_prot (struct page *page,pgprot_t prot); -static inline void *kmap_atomic_prot (struct page *page,pgprot_t prot) -{ -preempt_disable (); -pagefault_disable (); -if (!PageHighMem (page)) -return page_address (page); - -return kmap_atomic_high_prot (page, prot); -} - -static inline void *kmap_atomic_high (struct page *page) -{ -return kmap_atomic_high_prot (page, kmap_prot); -} - -#define flush_cache_kmaps () flush_cache_all()#endif /* __KERNEL__ */
arch/sparc/mm/highmem.c renamed from arch/sparc/mm/highmem.c~arch-kmap-define-kmap_atomic_prot-for-all-archs +3 -3
@@ -54,7 +54,7 @@ void __init kmap_init(void) kmap_prot =__pgprot (SRMMU_ET_PTE |SRMMU_PRIV |SRMMU_CACHE ); } -void *kmap_atomic_high (struct page *page) +void *kmap_atomic_high_prot (struct page *page,pgprot_t prot) {unsigned long vaddr;long idx, type;
@@ -73,7 +73,7 @@ void *kmap_atomic_high(struct page *page#ifdef CONFIG_DEBUG_HIGHMEM BUG_ON (!pte_none (*(kmap_pte-idx)));#endif -set_pte (kmap_pte-idx,mk_pte (page, kmap_prot)); +set_pte (kmap_pte-idx,mk_pte (page, prot));/* XXX Fix - Anton */ #if 0 __flush_tlb_one (vaddr);
@@ -83,7 +83,7 @@ void *kmap_atomic_high(struct page *pagereturn (void *) vaddr; } -EXPORT_SYMBOL (kmap_atomic_high); +EXPORT_SYMBOL (kmap_atomic_high_prot);void kunmap_atomic_high (void *kvaddr) {
arch/x86/include/asm/highmem.h renamed from arch/x86/include/asm/highmem.h~arch-kmap-define-kmap_atomic_prot-for-all-archs +0 -14
@@ -58,20 +58,6 @@ 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_atomic_high_prot (struct page *page,pgprot_t prot); -static inline void *kmap_atomic_prot (struct page *page,pgprot_t prot) -{ -preempt_disable (); -pagefault_disable (); -if (!PageHighMem (page)) -return page_address (page); - -return kmap_atomic_high_prot (page, prot); -} -static inline void *kmap_atomic_high (struct page *page) -{ -return kmap_atomic_high_prot (page, kmap_prot); -}void *kmap_atomic_pfn (unsigned long pfn);void *kmap_atomic_prot_pfn (unsigned long pfn,pgprot_t prot);
arch/xtensa/mm/highmem.c renamed from arch/xtensa/mm/highmem.c~arch-kmap-define-kmap_atomic_prot-for-all-archs +3 -3
@@ -37,7 +37,7 @@ static inline enum fixed_addresses kmap_ color; } -void *kmap_atomic_high (struct page *page) +void *kmap_atomic_high_prot (struct page *page,pgprot_t prot) {enum fixed_addresses idx;unsigned long vaddr;
@@ -48,11 +48,11 @@ void *kmap_atomic_high(struct page *page#ifdef CONFIG_DEBUG_HIGHMEM BUG_ON (!pte_none (*(kmap_pte + idx)));#endif -set_pte (kmap_pte + idx,mk_pte (page, kmap_prot)); +set_pte (kmap_pte + idx,mk_pte (page, prot));return (void *)vaddr; } -EXPORT_SYMBOL (kmap_atomic_high); +EXPORT_SYMBOL (kmap_atomic_high_prot);void kunmap_atomic_high (void *kvaddr) {
include/linux/highmem.h renamed from include/linux/highmem.h~arch-kmap-define-kmap_atomic_prot-for-all-archs +4 -3
@@ -32,7 +32,7 @@ static inline void invalidate_kernel_vma#include <asm/kmap_types.h> #ifdef CONFIG_HIGHMEM -extern void *kmap_atomic_high (struct page *page); +extern void *kmap_atomic_high_prot (struct page *page,pgprot_t prot);extern void kunmap_atomic_high (void *kvaddr);#include <asm/highmem.h>
@@ -77,14 +77,15 @@ static inline void kunmap(struct page *p* be used in IRQ contexts, so in some (very limited) cases we need * it. */ -static inline void *kmap_atomic (struct page *page) +static inline void *kmap_atomic_prot (struct page *page,pgprot_t prot) {preempt_disable ();pagefault_disable ();if (!PageHighMem (page))return page_address (page); -return kmap_atomic_high (page); +return kmap_atomic_high_prot (page, prot); } +#define kmap_atomic (page) kmap_atomic_prot(page, kmap_prot)/* declarations for linux/mm/highmem.c */ unsigned int nr_free_highpages (void );
_
Patches currently in -mm which might be from [email protected] are