kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/arch/m68k/include/asm/pgtable_mm.h
..
..
@@ -2,7 +2,12 @@
2
2
 #ifndef _M68K_PGTABLE_H
3
3
 #define _M68K_PGTABLE_H
4
4
 
5
-#include <asm-generic/4level-fixup.h>
5
+
6
+#if defined(CONFIG_SUN3) || defined(CONFIG_COLDFIRE)
7
+#include <asm-generic/pgtable-nopmd.h>
8
+#else
9
+#include <asm-generic/pgtable-nopud.h>
10
+#endif
6
11
 
7
12
 #include <asm/setup.h>
8
13
 
..
..
@@ -30,10 +35,8 @@
30
35
 
31
36
 
32
37
 /* PMD_SHIFT determines the size of the area a second-level page table can map */
33
-#ifdef CONFIG_SUN3
34
-#define PMD_SHIFT       17
35
-#else
36
-#define PMD_SHIFT	22
38
+#if CONFIG_PGTABLE_LEVELS == 3
39
+#define PMD_SHIFT	18
37
40
 #endif
38
41
 #define PMD_SIZE	(1UL << PMD_SHIFT)
39
42
 #define PMD_MASK	(~(PMD_SIZE-1))
..
..
@@ -64,8 +67,8 @@
64
67
 #define PTRS_PER_PMD	1
65
68
 #define PTRS_PER_PGD	1024
66
69
 #else
67
-#define PTRS_PER_PTE	1024
68
-#define PTRS_PER_PMD	8
70
+#define PTRS_PER_PTE	64
71
+#define PTRS_PER_PMD	128
69
72
 #define PTRS_PER_PGD	128
70
73
 #endif
71
74
 #define USER_PTRS_PER_PGD	(TASK_SIZE/PGDIR_SIZE)
..
..
@@ -73,8 +76,8 @@
73
76
 
74
77
 /* Virtual address region for use by kernel_map() */
75
78
 #ifdef CONFIG_SUN3
76
-#define KMAP_START     0x0DC00000
77
-#define KMAP_END       0x0E000000
79
+#define KMAP_START	0x0dc00000
80
+#define KMAP_END	0x0e000000
78
81
 #elif defined(CONFIG_COLDFIRE)
79
82
 #define KMAP_START	0xe0000000
80
83
 #define KMAP_END	0xf0000000
..
..
@@ -169,15 +172,10 @@
169
172
 	    ? (__pgprot((pgprot_val(prot) & _CACHEMASK040) | _PAGE_NOCACHE_S))	\
170
173
 	    : (prot)))
171
174
 
175
+pgprot_t pgprot_dmacoherent(pgprot_t prot);
176
+#define pgprot_dmacoherent(prot)	pgprot_dmacoherent(prot)
177
+
172
178
 #endif /* CONFIG_COLDFIRE */
173
-#include <asm-generic/pgtable.h>
174
179
 #endif /* !__ASSEMBLY__ */
175
-
176
-/*
177
- * No page table caches to initialise
178
- */
179
-#define pgtable_cache_init()	do { } while (0)
180
-
181
-#define check_pgt_cache()	do { } while (0)
182
180
 
183
181
 #endif /* _M68K_PGTABLE_H */