diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-11-02 14:55:54 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-11-02 14:55:56 +1100 |
commit | 4cb2de2063db3f7a0b9706fd3b8cb6771b4df3b7 (patch) | |
tree | 9f9b0f9fe990c73b250386744019181f872a3e3a /arch/microblaze/include/asm/highmem.h | |
parent | 2727c56c12b19283fd0eedf3271e2e30622b8ed9 (diff) | |
parent | 481e86742ee1381cda7da08e90204e164561933c (diff) |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/microblaze/include/asm/highmem.h')
-rw-r--r-- | arch/microblaze/include/asm/highmem.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/microblaze/include/asm/highmem.h b/arch/microblaze/include/asm/highmem.h index d04638932438..67925ef18cfa 100644 --- a/arch/microblaze/include/asm/highmem.h +++ b/arch/microblaze/include/asm/highmem.h @@ -76,19 +76,6 @@ static inline void *kmap_atomic(struct page *page) return kmap_atomic_prot(page, kmap_prot); } -static inline struct page *kmap_atomic_to_page(void *ptr) -{ - unsigned long idx, vaddr = (unsigned long) ptr; - pte_t *pte; - - if (vaddr < FIXADDR_START) - return virt_to_page(ptr); - - idx = virt_to_fix(vaddr); - pte = kmap_pte - (idx - FIX_KMAP_BEGIN); - return pte_page(*pte); -} - #define flush_cache_kmaps() { flush_icache(); flush_dcache(); } #endif /* __KERNEL__ */ |