.. | .. |
---|
68 | 68 | #define clear_user_page(page, vaddr, pg) clear_page(page) |
---|
69 | 69 | #define copy_user_page(to, from, vaddr, pg) copy_page(to, from) |
---|
70 | 70 | |
---|
71 | | -#define __alloc_zeroed_user_highpage(movableflags, vma, vaddr) \ |
---|
72 | | - alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr) |
---|
73 | | -#define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE |
---|
| 71 | +#define alloc_zeroed_user_highpage_movable(vma, vaddr) \ |
---|
| 72 | + alloc_page_vma(GFP_HIGHUSER_MOVABLE | __GFP_ZERO, vma, vaddr) |
---|
| 73 | +#define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE_MOVABLE |
---|
74 | 74 | |
---|
75 | 75 | /* |
---|
76 | 76 | * These are used to make use of C type-checking.. |
---|
.. | .. |
---|
153 | 153 | #define HAVE_ARCH_FREE_PAGE |
---|
154 | 154 | #define HAVE_ARCH_ALLOC_PAGE |
---|
155 | 155 | |
---|
| 156 | +#if IS_ENABLED(CONFIG_PGSTE) |
---|
| 157 | +int arch_make_page_accessible(struct page *page); |
---|
| 158 | +#define HAVE_ARCH_MAKE_PAGE_ACCESSIBLE |
---|
| 159 | +#endif |
---|
| 160 | + |
---|
156 | 161 | #endif /* !__ASSEMBLY__ */ |
---|
157 | 162 | |
---|
158 | 163 | #define __PAGE_OFFSET 0x0UL |
---|
.. | .. |
---|
161 | 166 | #define __pa(x) ((unsigned long)(x)) |
---|
162 | 167 | #define __va(x) ((void *)(unsigned long)(x)) |
---|
163 | 168 | |
---|
164 | | -#define virt_to_pfn(kaddr) (__pa(kaddr) >> PAGE_SHIFT) |
---|
165 | | -#define pfn_to_virt(pfn) __va((pfn) << PAGE_SHIFT) |
---|
| 169 | +#define phys_to_pfn(phys) ((phys) >> PAGE_SHIFT) |
---|
| 170 | +#define pfn_to_phys(pfn) ((pfn) << PAGE_SHIFT) |
---|
| 171 | + |
---|
| 172 | +#define phys_to_page(phys) pfn_to_page(phys_to_pfn(phys)) |
---|
| 173 | +#define page_to_phys(page) pfn_to_phys(page_to_pfn(page)) |
---|
| 174 | + |
---|
| 175 | +#define pfn_to_virt(pfn) __va(pfn_to_phys(pfn)) |
---|
| 176 | +#define virt_to_pfn(kaddr) (phys_to_pfn(__pa(kaddr))) |
---|
| 177 | +#define pfn_to_kaddr(pfn) pfn_to_virt(pfn) |
---|
166 | 178 | |
---|
167 | 179 | #define virt_to_page(kaddr) pfn_to_page(virt_to_pfn(kaddr)) |
---|
168 | 180 | #define page_to_virt(page) pfn_to_virt(page_to_pfn(page)) |
---|
169 | 181 | |
---|
170 | | -#define phys_to_pfn(kaddr) ((kaddr) >> PAGE_SHIFT) |
---|
171 | | -#define pfn_to_phys(pfn) ((pfn) << PAGE_SHIFT) |
---|
| 182 | +#define virt_addr_valid(kaddr) pfn_valid(virt_to_pfn(kaddr)) |
---|
172 | 183 | |
---|
173 | | -#define phys_to_page(kaddr) pfn_to_page(phys_to_pfn(kaddr)) |
---|
174 | | -#define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) |
---|
175 | | - |
---|
176 | | -#define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT) |
---|
177 | | - |
---|
178 | | -#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | \ |
---|
179 | | - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) |
---|
180 | | - |
---|
181 | | -#define ARCH_ZONE_DMA_BITS 31 |
---|
| 184 | +#define VM_DATA_DEFAULT_FLAGS VM_DATA_FLAGS_NON_EXEC |
---|
182 | 185 | |
---|
183 | 186 | #include <asm-generic/memory_model.h> |
---|
184 | 187 | #include <asm-generic/getorder.h> |
---|