hc
2024-05-10 748e4f3d702def1a4bff191e0cf93b6a05340f01
kernel/arch/sparc/include/asm/page_32.h
....@@ -54,7 +54,7 @@
5454 */
5555 typedef struct { unsigned long pte; } pte_t;
5656 typedef struct { unsigned long iopte; } iopte_t;
57
-typedef struct { unsigned long pmdv[16]; } pmd_t;
57
+typedef struct { unsigned long pmd; } pmd_t;
5858 typedef struct { unsigned long pgd; } pgd_t;
5959 typedef struct { unsigned long ctxd; } ctxd_t;
6060 typedef struct { unsigned long pgprot; } pgprot_t;
....@@ -62,7 +62,7 @@
6262
6363 #define pte_val(x) ((x).pte)
6464 #define iopte_val(x) ((x).iopte)
65
-#define pmd_val(x) ((x).pmdv[0])
65
+#define pmd_val(x) ((x).pmd)
6666 #define pgd_val(x) ((x).pgd)
6767 #define ctxd_val(x) ((x).ctxd)
6868 #define pgprot_val(x) ((x).pgprot)
....@@ -82,7 +82,7 @@
8282 */
8383 typedef unsigned long pte_t;
8484 typedef unsigned long iopte_t;
85
-typedef struct { unsigned long pmdv[16]; } pmd_t;
85
+typedef unsigned long pmd_t;
8686 typedef unsigned long pgd_t;
8787 typedef unsigned long ctxd_t;
8888 typedef unsigned long pgprot_t;
....@@ -90,14 +90,14 @@
9090
9191 #define pte_val(x) (x)
9292 #define iopte_val(x) (x)
93
-#define pmd_val(x) ((x).pmdv[0])
93
+#define pmd_val(x) (x)
9494 #define pgd_val(x) (x)
9595 #define ctxd_val(x) (x)
9696 #define pgprot_val(x) (x)
9797 #define iopgprot_val(x) (x)
9898
9999 #define __pte(x) (x)
100
-#define __pmd(x) ((pmd_t) { { (x) }, })
100
+#define __pmd(x) (x)
101101 #define __iopte(x) (x)
102102 #define __pgd(x) (x)
103103 #define __ctxd(x) (x)
....@@ -106,7 +106,7 @@
106106
107107 #endif
108108
109
-typedef struct page *pgtable_t;
109
+typedef pte_t *pgtable_t;
110110
111111 #define TASK_UNMAPPED_BASE 0x50000000
112112
....@@ -132,9 +132,6 @@
132132
133133 #define pfn_valid(pfn) (((pfn) >= (pfn_base)) && (((pfn)-(pfn_base)) < max_mapnr))
134134 #define virt_addr_valid(kaddr) ((((unsigned long)(kaddr)-PAGE_OFFSET)>>PAGE_SHIFT) < max_mapnr)
135
-
136
-#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
137
- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
138135
139136 #include <asm-generic/memory_model.h>
140137 #include <asm-generic/getorder.h>