.. | .. |
---|
49 | 49 | return 6; |
---|
50 | 50 | if (PAGE_SIZE > (256 << 10)) |
---|
51 | 51 | return 7; /* reserved */ |
---|
52 | | - /* fall through */ |
---|
| 52 | + fallthrough; |
---|
53 | 53 | case MIPS_CONF4_MMUEXTDEF_VTLBSIZEEXT: |
---|
54 | 54 | return (PAGE_SHIFT - 10) / 2; |
---|
55 | 55 | default: |
---|
.. | .. |
---|
154 | 154 | typedef struct { unsigned long pgprot; } pgprot_t; |
---|
155 | 155 | #define pgprot_val(x) ((x).pgprot) |
---|
156 | 156 | #define __pgprot(x) ((pgprot_t) { (x) } ) |
---|
| 157 | +#define pte_pgprot(x) __pgprot(pte_val(x) & ~_PFN_MASK) |
---|
157 | 158 | |
---|
158 | 159 | /* |
---|
159 | 160 | * On R4000-style MMUs where a TLB entry is mapping a adjacent even / odd |
---|
.. | .. |
---|
248 | 249 | #define virt_to_pfn(kaddr) PFN_DOWN(virt_to_phys((void *)(kaddr))) |
---|
249 | 250 | #define virt_to_page(kaddr) pfn_to_page(virt_to_pfn(kaddr)) |
---|
250 | 251 | |
---|
251 | | -extern int __virt_addr_valid(const volatile void *kaddr); |
---|
| 252 | +extern bool __virt_addr_valid(const volatile void *kaddr); |
---|
252 | 253 | #define virt_addr_valid(kaddr) \ |
---|
253 | 254 | __virt_addr_valid((const volatile void *) (kaddr)) |
---|
254 | 255 | |
---|
255 | | -#define VM_DATA_DEFAULT_FLAGS \ |
---|
256 | | - (VM_READ | VM_WRITE | \ |
---|
257 | | - ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \ |
---|
258 | | - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) |
---|
259 | | - |
---|
260 | | -#define UNCAC_ADDR(addr) (UNCAC_BASE + __pa(addr)) |
---|
261 | | -#define CAC_ADDR(addr) ((unsigned long)__va((addr) - UNCAC_BASE)) |
---|
| 256 | +#define VM_DATA_DEFAULT_FLAGS VM_DATA_FLAGS_TSK_EXEC |
---|
262 | 257 | |
---|
263 | 258 | #include <asm-generic/memory_model.h> |
---|
264 | 259 | #include <asm-generic/getorder.h> |
---|