x86powerpcmicroblaze-kmap-move-preempt-disable.patch removed from -mm tree
The patch titled
Subject: {x86,powerpc,microblaze}/kmap: move preempt disable
has been removed from the -mm tree. Its filename was
x86powerpcmicroblaze-kmap-move-preempt-disable.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Ira Weiny <[email protected]>
Subject: {x86,powerpc,microblaze}/kmap: move preempt disable
During this kmap() conversion series we must maintain bisect-ability. To do this, kmap_atomic_prot() in x86, powerpc, and microblaze need to remain functional.
Create a temporary inline version of kmap_atomic_prot within these architectures so we can rework their kmap_atomic() calls and then lift kmap_atomic_prot() to the core.
---
arch/microblaze/include/asm/highmem.h | 11 ++++++++++- arch/microblaze/mm/highmem.c | 10 ++-------- arch/powerpc/include/asm/highmem.h | 11 ++++++++++- arch/powerpc/mm/highmem.c | 9 ++------- arch/x86/include/asm/highmem.h | 11 ++++++++++- arch/x86/mm/highmem_32.c | 10 ++-------- 6 files changed, 36 insertions(+), 26 deletions(-)
arch/microblaze/include/asm/highmem.h renamed from arch/microblaze/include/asm/highmem.h~x86powerpcmicroblaze-kmap-move-preempt-disable +10 -1
@@ -51,7 +51,16 @@ 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_prot (struct page *page,pgprot_t prot); +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); +}extern void __kunmap_atomic (void *kvaddr);static inline void *kmap_atomic (struct page *page)
arch/microblaze/mm/highmem.c renamed from arch/microblaze/mm/highmem.c~x86powerpcmicroblaze-kmap-move-preempt-disable +2 -8
@@ -32,18 +32,12 @@*/ #include <asm/tlbflush.h> -void *kmap_atomic_prot (struct page *page,pgprot_t prot) +void *kmap_atomic_high_prot (struct page *page,pgprot_t prot) {unsigned long vaddr;int idx, type; -preempt_disable (); -pagefault_disable (); -if (!PageHighMem (page)) -return page_address (page); - - type =kmap_atomic_idx_push (); idx = type +KM_TYPE_NR *smp_processor_id (); vaddr =__fix_to_virt (FIX_KMAP_BEGIN + idx);
@@ -55,7 +49,7 @@ void *kmap_atomic_prot(struct page *pagereturn (void *) vaddr; } -EXPORT_SYMBOL (kmap_atomic_prot); +EXPORT_SYMBOL (kmap_atomic_high_prot);void __kunmap_atomic (void *kvaddr) {
arch/powerpc/include/asm/highmem.h renamed from arch/powerpc/include/asm/highmem.h~x86powerpcmicroblaze-kmap-move-preempt-disable +10 -1
@@ -59,7 +59,16 @@ 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_prot (struct page *page,pgprot_t prot); +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); +}extern void __kunmap_atomic (void *kvaddr);static inline void *kmap_atomic (struct page *page)
arch/powerpc/mm/highmem.c renamed from arch/powerpc/mm/highmem.c~x86powerpcmicroblaze-kmap-move-preempt-disable +2 -7
@@ -30,16 +30,11 @@* be used in IRQ contexts, so in some (very limited) cases we need * it. */ -void *kmap_atomic_prot (struct page *page,pgprot_t prot) +void *kmap_atomic_high_prot (struct page *page,pgprot_t prot) {unsigned long vaddr;int idx, type; -preempt_disable (); -pagefault_disable (); -if (!PageHighMem (page)) -return page_address (page); - type =kmap_atomic_idx_push (); idx = type +KM_TYPE_NR *smp_processor_id (); vaddr =__fix_to_virt (FIX_KMAP_BEGIN + idx);
@@ -49,7 +44,7 @@ void *kmap_atomic_prot(struct page *pagereturn (void *) vaddr; } -EXPORT_SYMBOL (kmap_atomic_prot); +EXPORT_SYMBOL (kmap_atomic_high_prot);void __kunmap_atomic (void *kvaddr) {
arch/x86/include/asm/highmem.h renamed from arch/x86/include/asm/highmem.h~x86powerpcmicroblaze-kmap-move-preempt-disable +10 -1
@@ -58,7 +58,16 @@ extern unsigned long highstart_pfn, high#define PKMAP_NR (virt) ((virt-PKMAP_BASE) >> PAGE_SHIFT)#define PKMAP_ADDR (nr) (PKMAP_BASE + ((nr) << PAGE_SHIFT)) -void *kmap_atomic_prot (struct page *page,pgprot_t prot); +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); +}void *kmap_atomic (struct page *page);void __kunmap_atomic (void *kvaddr);void *kmap_atomic_pfn (unsigned long pfn);
arch/x86/mm/highmem_32.c renamed from arch/x86/mm/highmem_32.c~x86powerpcmicroblaze-kmap-move-preempt-disable +1 -6
@@ -12,17 +12,11 @@* However when holding an atomic kmap it is not legal to sleep, so atomic * kmaps are appropriate for short, tight code paths only. */ -void *kmap_atomic_prot (struct page *page,pgprot_t prot) +void *kmap_atomic_high_prot (struct page *page,pgprot_t prot) {unsigned long vaddr;int idx, type; -preempt_disable (); -pagefault_disable (); - -if (!PageHighMem (page)) -return page_address (page);