hc
2024-05-10 cde9070d9970eef1f7ec2360586c802a16230ad8
kernel/arch/mips/include/asm/page.h
....@@ -49,7 +49,7 @@
4949 return 6;
5050 if (PAGE_SIZE > (256 << 10))
5151 return 7; /* reserved */
52
- /* fall through */
52
+ fallthrough;
5353 case MIPS_CONF4_MMUEXTDEF_VTLBSIZEEXT:
5454 return (PAGE_SHIFT - 10) / 2;
5555 default:
....@@ -154,6 +154,7 @@
154154 typedef struct { unsigned long pgprot; } pgprot_t;
155155 #define pgprot_val(x) ((x).pgprot)
156156 #define __pgprot(x) ((pgprot_t) { (x) } )
157
+#define pte_pgprot(x) __pgprot(pte_val(x) & ~_PFN_MASK)
157158
158159 /*
159160 * On R4000-style MMUs where a TLB entry is mapping a adjacent even / odd
....@@ -248,17 +249,11 @@
248249 #define virt_to_pfn(kaddr) PFN_DOWN(virt_to_phys((void *)(kaddr)))
249250 #define virt_to_page(kaddr) pfn_to_page(virt_to_pfn(kaddr))
250251
251
-extern int __virt_addr_valid(const volatile void *kaddr);
252
+extern bool __virt_addr_valid(const volatile void *kaddr);
252253 #define virt_addr_valid(kaddr) \
253254 __virt_addr_valid((const volatile void *) (kaddr))
254255
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
262257
263258 #include <asm-generic/memory_model.h>
264259 #include <asm-generic/getorder.h>