diff options
Diffstat (limited to 'arch/mips/mm/ioremap.c')
-rw-r--r-- | arch/mips/mm/ioremap.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/mips/mm/ioremap.c b/arch/mips/mm/ioremap.c index 7f840bc08abf..8d5008cbdc0f 100644 --- a/arch/mips/mm/ioremap.c +++ b/arch/mips/mm/ioremap.c | |||
@@ -17,9 +17,9 @@ | |||
17 | #include <asm/tlbflush.h> | 17 | #include <asm/tlbflush.h> |
18 | 18 | ||
19 | static inline void remap_area_pte(pte_t * pte, unsigned long address, | 19 | static inline void remap_area_pte(pte_t * pte, unsigned long address, |
20 | phys_t size, phys_t phys_addr, unsigned long flags) | 20 | phys_addr_t size, phys_addr_t phys_addr, unsigned long flags) |
21 | { | 21 | { |
22 | phys_t end; | 22 | phys_addr_t end; |
23 | unsigned long pfn; | 23 | unsigned long pfn; |
24 | pgprot_t pgprot = __pgprot(_PAGE_GLOBAL | _PAGE_PRESENT | __READABLE | 24 | pgprot_t pgprot = __pgprot(_PAGE_GLOBAL | _PAGE_PRESENT | __READABLE |
25 | | __WRITEABLE | flags); | 25 | | __WRITEABLE | flags); |
@@ -43,9 +43,9 @@ static inline void remap_area_pte(pte_t * pte, unsigned long address, | |||
43 | } | 43 | } |
44 | 44 | ||
45 | static inline int remap_area_pmd(pmd_t * pmd, unsigned long address, | 45 | static inline int remap_area_pmd(pmd_t * pmd, unsigned long address, |
46 | phys_t size, phys_t phys_addr, unsigned long flags) | 46 | phys_addr_t size, phys_addr_t phys_addr, unsigned long flags) |
47 | { | 47 | { |
48 | phys_t end; | 48 | phys_addr_t end; |
49 | 49 | ||
50 | address &= ~PGDIR_MASK; | 50 | address &= ~PGDIR_MASK; |
51 | end = address + size; | 51 | end = address + size; |
@@ -64,8 +64,8 @@ static inline int remap_area_pmd(pmd_t * pmd, unsigned long address, | |||
64 | return 0; | 64 | return 0; |
65 | } | 65 | } |
66 | 66 | ||
67 | static int remap_area_pages(unsigned long address, phys_t phys_addr, | 67 | static int remap_area_pages(unsigned long address, phys_addr_t phys_addr, |
68 | phys_t size, unsigned long flags) | 68 | phys_addr_t size, unsigned long flags) |
69 | { | 69 | { |
70 | int error; | 70 | int error; |
71 | pgd_t * dir; | 71 | pgd_t * dir; |
@@ -111,13 +111,13 @@ static int remap_area_pages(unsigned long address, phys_t phys_addr, | |||
111 | * caller shouldn't need to know that small detail. | 111 | * caller shouldn't need to know that small detail. |
112 | */ | 112 | */ |
113 | 113 | ||
114 | #define IS_LOW512(addr) (!((phys_t)(addr) & (phys_t) ~0x1fffffffULL)) | 114 | #define IS_LOW512(addr) (!((phys_addr_t)(addr) & (phys_addr_t) ~0x1fffffffULL)) |
115 | 115 | ||
116 | void __iomem * __ioremap(phys_t phys_addr, phys_t size, unsigned long flags) | 116 | void __iomem * __ioremap(phys_addr_t phys_addr, phys_addr_t size, unsigned long flags) |
117 | { | 117 | { |
118 | struct vm_struct * area; | 118 | struct vm_struct * area; |
119 | unsigned long offset; | 119 | unsigned long offset; |
120 | phys_t last_addr; | 120 | phys_addr_t last_addr; |
121 | void * addr; | 121 | void * addr; |
122 | 122 | ||
123 | phys_addr = fixup_bigphys_addr(phys_addr, size); | 123 | phys_addr = fixup_bigphys_addr(phys_addr, size); |