Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Blackfin: convert page/tlb to asm-generic

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

+4 -157
-1
arch/blackfin/include/asm/io.h
··· 222 222 #define ioport_unmap(addr) 223 223 224 224 /* Pages to physical address... */ 225 - #define page_to_phys(page) ((page - mem_map) << PAGE_SHIFT) 226 225 #define page_to_bus(page) ((page - mem_map) << PAGE_SHIFT) 227 226 228 227 #define phys_to_virt(vaddr) ((void *) (vaddr))
+2 -83
arch/blackfin/include/asm/page.h
··· 1 1 #ifndef _BLACKFIN_PAGE_H 2 2 #define _BLACKFIN_PAGE_H 3 3 4 - /* PAGE_SHIFT determines the page size */ 4 + #include <asm-generic/page.h> 5 + #define MAP_NR(addr) (((unsigned long)(addr)-PAGE_OFFSET) >> PAGE_SHIFT) 5 6 6 - #define PAGE_SHIFT 12 7 - #ifdef __ASSEMBLY__ 8 - #define PAGE_SIZE (1 << PAGE_SHIFT) 9 - #else 10 - #define PAGE_SIZE (1UL << PAGE_SHIFT) 11 7 #endif 12 - #define PAGE_MASK (~(PAGE_SIZE-1)) 13 - 14 - #include <asm/setup.h> 15 - 16 - #ifndef __ASSEMBLY__ 17 - 18 - #define get_user_page(vaddr) __get_free_page(GFP_KERNEL) 19 - #define free_user_page(page, addr) free_page(addr) 20 - 21 - #define clear_page(page) memset((page), 0, PAGE_SIZE) 22 - #define copy_page(to,from) memcpy((to), (from), PAGE_SIZE) 23 - 24 - #define clear_user_page(page, vaddr,pg) clear_page(page) 25 - #define copy_user_page(to, from, vaddr,pg) copy_page(to, from) 26 - 27 - /* 28 - * These are used to make use of C type-checking.. 29 - */ 30 - typedef struct { 31 - unsigned long pte; 32 - } pte_t; 33 - typedef struct { 34 - unsigned long pmd[16]; 35 - } pmd_t; 36 - typedef struct { 37 - unsigned long pgd; 38 - } pgd_t; 39 - typedef struct { 40 - unsigned long pgprot; 41 - } pgprot_t; 42 - typedef struct page *pgtable_t; 43 - 44 - #define pte_val(x) ((x).pte) 45 - #define pmd_val(x) ((&x)->pmd[0]) 46 - #define pgd_val(x) ((x).pgd) 47 - #define pgprot_val(x) ((x).pgprot) 48 - 49 - #define __pte(x) ((pte_t) { (x) } ) 50 - #define __pmd(x) ((pmd_t) { (x) } ) 51 - #define __pgd(x) ((pgd_t) { (x) } ) 52 - #define __pgprot(x) ((pgprot_t) { (x) } ) 53 - 54 - extern unsigned long memory_start; 55 - extern unsigned long memory_end; 56 - 57 - #endif /* !__ASSEMBLY__ */ 58 - 59 - #include <asm/page_offset.h> 60 - #include <asm/io.h> 61 - 62 - #define PAGE_OFFSET (PAGE_OFFSET_RAW) 63 - 64 - #ifndef __ASSEMBLY__ 65 - 66 - #define __pa(vaddr) virt_to_phys((void *)(vaddr)) 67 - #define __va(paddr) phys_to_virt((unsigned long)(paddr)) 68 - 69 - #define MAP_NR(addr) (((unsigned long)(addr)-PAGE_OFFSET) >> PAGE_SHIFT) 70 - 71 - #define virt_to_pfn(kaddr) (__pa(kaddr) >> PAGE_SHIFT) 72 - #define pfn_to_virt(pfn) __va((pfn) << PAGE_SHIFT) 73 - #define virt_to_page(addr) (mem_map + (((unsigned long)(addr)-PAGE_OFFSET) >> PAGE_SHIFT)) 74 - #define page_to_virt(page) ((((page) - mem_map) << PAGE_SHIFT) + PAGE_OFFSET) 75 - #define VALID_PAGE(page) ((page - mem_map) < max_mapnr) 76 - 77 - #define pfn_to_page(pfn) virt_to_page(pfn_to_virt(pfn)) 78 - #define page_to_pfn(page) virt_to_pfn(page_to_virt(page)) 79 - #define pfn_valid(pfn) ((pfn) < max_mapnr) 80 - 81 - #define virt_addr_valid(kaddr) (((void *)(kaddr) >= (void *)PAGE_OFFSET) && \ 82 - ((void *)(kaddr) < (void *)memory_end)) 83 - 84 - #include <asm-generic/getorder.h> 85 - 86 - #endif /* __ASSEMBLY__ */ 87 - 88 - #endif /* _BLACKFIN_PAGE_H */
+1 -56
arch/blackfin/include/asm/tlbflush.h
··· 1 - #ifndef _BLACKFIN_TLBFLUSH_H 2 - #define _BLACKFIN_TLBFLUSH_H 3 - 4 - /* 5 - * Copyright (C) 2000 Lineo, David McCullough <davidm@uclinux.org> 6 - * Copyright (C) 2000-2002, Greg Ungerer <gerg@snapgear.com> 7 - */ 8 - 9 - #include <asm/setup.h> 10 - 11 - /* 12 - * flush all user-space atc entries. 13 - */ 14 - static inline void __flush_tlb(void) 15 - { 16 - BUG(); 17 - } 18 - 19 - static inline void __flush_tlb_one(unsigned long addr) 20 - { 21 - BUG(); 22 - } 23 - 24 - #define flush_tlb() __flush_tlb() 25 - 26 - /* 27 - * flush all atc entries (both kernel and user-space entries). 28 - */ 29 - static inline void flush_tlb_all(void) 30 - { 31 - BUG(); 32 - } 33 - 34 - static inline void flush_tlb_mm(struct mm_struct *mm) 35 - { 36 - BUG(); 37 - } 38 - 39 - static inline void flush_tlb_page(struct vm_area_struct *vma, 40 - unsigned long addr) 41 - { 42 - BUG(); 43 - } 44 - 45 - static inline void flush_tlb_range(struct mm_struct *mm, 46 - unsigned long start, unsigned long end) 47 - { 48 - BUG(); 49 - } 50 - 51 - static inline void flush_tlb_kernel_page(unsigned long addr) 52 - { 53 - BUG(); 54 - } 55 - 56 - #endif 1 + #include <asm-generic/tlbflush.h>
+1 -17
arch/blackfin/include/asm/ucontext.h
··· 1 - /** Changes made by Tony Kou Lineo Inc. May 2001 2 - * 3 - * Based on: include/m68knommu/ucontext.h 4 - */ 5 - 6 - #ifndef _BLACKFIN_UCONTEXT_H 7 - #define _BLACKFIN_UCONTEXT_H 8 - 9 - struct ucontext { 10 - unsigned long uc_flags; /* the others are necessary */ 11 - struct ucontext *uc_link; 12 - stack_t uc_stack; 13 - struct sigcontext uc_mcontext; 14 - sigset_t uc_sigmask; /* mask last for extensibility */ 15 - }; 16 - 17 - #endif /* _BLACKFIN_UCONTEXT_H */ 1 + #include <asm-generic/ucontext.h>