hc
2024-05-10 37f49e37ab4cb5d0bc4c60eb5c6d4dd57db767bb
kernel/arch/m68k/include/asm/pgtable_mm.h
....@@ -2,7 +2,12 @@
22 #ifndef _M68K_PGTABLE_H
33 #define _M68K_PGTABLE_H
44
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
611
712 #include <asm/setup.h>
813
....@@ -30,10 +35,8 @@
3035
3136
3237 /* 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
3740 #endif
3841 #define PMD_SIZE (1UL << PMD_SHIFT)
3942 #define PMD_MASK (~(PMD_SIZE-1))
....@@ -64,8 +67,8 @@
6467 #define PTRS_PER_PMD 1
6568 #define PTRS_PER_PGD 1024
6669 #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
6972 #define PTRS_PER_PGD 128
7073 #endif
7174 #define USER_PTRS_PER_PGD (TASK_SIZE/PGDIR_SIZE)
....@@ -73,8 +76,8 @@
7376
7477 /* Virtual address region for use by kernel_map() */
7578 #ifdef CONFIG_SUN3
76
-#define KMAP_START 0x0DC00000
77
-#define KMAP_END 0x0E000000
79
+#define KMAP_START 0x0dc00000
80
+#define KMAP_END 0x0e000000
7881 #elif defined(CONFIG_COLDFIRE)
7982 #define KMAP_START 0xe0000000
8083 #define KMAP_END 0xf0000000
....@@ -169,15 +172,10 @@
169172 ? (__pgprot((pgprot_val(prot) & _CACHEMASK040) | _PAGE_NOCACHE_S)) \
170173 : (prot)))
171174
175
+pgprot_t pgprot_dmacoherent(pgprot_t prot);
176
+#define pgprot_dmacoherent(prot) pgprot_dmacoherent(prot)
177
+
172178 #endif /* CONFIG_COLDFIRE */
173
-#include <asm-generic/pgtable.h>
174179 #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)
182180
183181 #endif /* _M68K_PGTABLE_H */