powerpc/mm: Make k(un)map_atomic out of line
PATCH 1/1 powerpc/mm: Make k(un)map_atomic out of line
Those functions are way too big to be inline, besides, kmap_atomic() wants to call debug_kmap_atomic() which isn't exported for modules and causes module link failures.
Signed-off-by Benjamin Herrenschmidt <[email protected]>
---
arch/powerpc/include/asm/highmem.h | 57 +-------------------------- arch/powerpc/mm/Makefile | 1 arch/powerpc/mm/highmem.c | 77 +++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 53 deletions(-)
arch/powerpc/include/asm/highmem.h +4 -53
@@ -22,9 +22,7 @@#ifdef __KERNEL__ -#include <linux/init.h> #include <linux/interrupt.h> -#include <linux/highmem.h> #include <asm/kmap_types.h> #include <asm/tlbflush.h> #include <asm/page.h>
@@ -62,6 +60,9 @@ extern pte_t *pkmap_page_table;extern void *kmap_high (struct page *page);extern void kunmap_high (struct page *page); +extern void *kmap_atomic_prot (struct page *page,enum km_type type, +pgprot_t prot); +extern void kunmap_atomic (void *kvaddr,enum km_type type);static inline void *kmap (struct page *page) {
@@ -79,62 +80,11 @@ static inline void kunmap(struct page *pkunmap_high (page); } -/* -* The use of kmap_atomic/kunmap_atomic is discouraged - kmap/kunmap -* gives a more generic (and caching) interface. But kmap_atomic can -* be used in IRQ contexts, so in some (very limited) cases we need -* it. -*/ -static inline void *kmap_atomic_prot (struct page *page,enum km_type type,pgprot_t prot) -{ -unsigned int idx; -unsigned long vaddr; - -/* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */ -pagefault_disable (); -if (!PageHighMem (page)) -return page_address (page); - -debug_kmap_atomic (type); - idx = type +KM_TYPE_NR *smp_processor_id (); - vaddr =__fix_to_virt (FIX_KMAP_BEGIN + idx); -#ifdef CONFIG_DEBUG_HIGHMEM -BUG_ON (!pte_none (*(kmap_pte-idx))); -#endif -__set_pte_at (&init_mm, vaddr, kmap_pte-idx,mk_pte (page, prot),1 ); -local_flush_tlb_page (NULL , vaddr); - -return (void *) vaddr; -} -static inline void *kmap_atomic (struct page *page,enum km_type type) {return kmap_atomic_prot (page, type, kmap_prot); } -static inline void kunmap_atomic (void *kvaddr,enum km_type type) -{ -#ifdef CONFIG_DEBUG_HIGHMEM -unsigned long vaddr = (unsigned long ) kvaddr &PAGE_MASK ; -enum fixed_addresses idx = type +KM_TYPE_NR *smp_processor_id (); - -if (vaddr <__fix_to_virt (FIX_KMAP_END )) { -pagefault_enable (); -return ; - } - -BUG_ON (vaddr !=__fix_to_virt (FIX_KMAP_BEGIN + idx)); - -/* -* force other mappings to Oops if they'll try to access -* this pte without first remap it -*/ -pte_clear (&init_mm, vaddr, kmap_pte-idx); -local_flush_tlb_page (NULL , vaddr); -#endif -pagefault_enable (); -} -static inline struct page *kmap_atomic_to_page (void *ptr) {unsigned long idx, vaddr = (unsigned long ) ptr;
@@ -148,6 +98,7 @@ static inline struct page *kmap_atomic_t return pte_page(*pte); } +#define flush_cache_kmaps () flush_cache_all()#endif /* __KERNEL__ */
arch/powerpc/mm/Makefile +1 -0
@@ -30,3 +30,4 @@ obj-$(CONFIG_PPC_MM_SLICES) += slice.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o obj-$(CONFIG_PPC_SUBPAGE_PROT) += subpage-prot.o obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-noncoherent.o +obj-$(CONFIG_HIGHMEM) += highmem.o
arch/powerpc/mm/highmem.c new file +77 -0
77 lines not on this page · raw message