hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/x86/include/asm/fixmap.h
....@@ -26,12 +26,12 @@
2626
2727 #ifndef __ASSEMBLY__
2828 #include <linux/kernel.h>
29
-#include <asm/acpi.h>
3029 #include <asm/apicdef.h>
3130 #include <asm/page.h>
31
+#include <asm/pgtable_types.h>
3232 #ifdef CONFIG_X86_32
3333 #include <linux/threads.h>
34
-#include <asm/kmap_types.h>
34
+#include <asm/kmap_size.h>
3535 #else
3636 #include <uapi/asm/vsyscall.h>
3737 #endif
....@@ -42,8 +42,7 @@
4242 * Because of this, FIXADDR_TOP x86 integration was left as later work.
4343 */
4444 #ifdef CONFIG_X86_32
45
-/* used by vmalloc.c, vsyscall.lds.S.
46
- *
45
+/*
4746 * Leave one empty page between vmalloc'ed areas and
4847 * the start of the fixmap.
4948 */
....@@ -95,16 +94,14 @@
9594 #endif
9695 #ifdef CONFIG_X86_32
9796 FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */
98
- FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,
97
+ FIX_KMAP_END = FIX_KMAP_BEGIN + (KM_MAX_IDX * NR_CPUS) - 1,
9998 #ifdef CONFIG_PCI_MMCONFIG
10099 FIX_PCIE_MCFG,
101100 #endif
102101 #endif
103
-#ifdef CONFIG_PARAVIRT
102
+#ifdef CONFIG_PARAVIRT_XXL
104103 FIX_PARAVIRT_BOOTMAP,
105104 #endif
106
- FIX_TEXT_POKE1, /* reserve 2 pages for text_poke() */
107
- FIX_TEXT_POKE0, /* first page is last, because allocation is backward */
108105 #ifdef CONFIG_X86_INTEL_MID
109106 FIX_LNW_VRTC,
110107 #endif
....@@ -122,7 +119,7 @@
122119 * before ioremap() is functional.
123120 *
124121 * If necessary we round it up to the next 512 pages boundary so
125
- * that we can have a single pgd entry and a single pte table:
122
+ * that we can have a single pmd entry and a single pte table:
126123 */
127124 #define NR_FIX_BTMAPS 64
128125 #define FIX_BTMAPS_SLOTS 8
....@@ -154,15 +151,13 @@
154151
155152 extern int fixmaps_set;
156153
157
-extern pte_t *kmap_pte;
158
-#define kmap_prot PAGE_KERNEL
159154 extern pte_t *pkmap_page_table;
160155
161156 void __native_set_fixmap(enum fixed_addresses idx, pte_t pte);
162157 void native_set_fixmap(unsigned /* enum fixed_addresses */ idx,
163158 phys_addr_t phys, pgprot_t flags);
164159
165
-#ifndef CONFIG_PARAVIRT
160
+#ifndef CONFIG_PARAVIRT_XXL
166161 static inline void __set_fixmap(enum fixed_addresses idx,
167162 phys_addr_t phys, pgprot_t flags)
168163 {