1 files changed, 1 insertions, 73 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 89d97477c1d9..bce2e5d9edd4 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -58,79 +58,7 @@
 #include "mm_internal.h"
-static void ident_pmd_init(unsigned long pmd_flag, pmd_t *pmd_page,
+#include "ident_map.c"
-                           unsigned long addr, unsigned long end)
-{
-        addr &= PMD_MASK;
-        for (; addr < end; addr += PMD_SIZE) {
-                pmd_t *pmd = pmd_page + pmd_index(addr);
-                if (!pmd_present(*pmd))
-                        set_pmd(pmd, __pmd(addr | pmd_flag));
-        }
-}
-static int ident_pud_init(struct x86_mapping_info *info, pud_t *pud_page,
-                          unsigned long addr, unsigned long end)
-{
-        unsigned long next;
-        for (; addr < end; addr = next) {
-                pud_t *pud = pud_page + pud_index(addr);
-                pmd_t *pmd;
-                next = (addr & PUD_MASK) + PUD_SIZE;
-                if (next > end)
-                        next = end;
-                if (pud_present(*pud)) {
-                        pmd = pmd_offset(pud, 0);
-                        ident_pmd_init(info->pmd_flag, pmd, addr, next);
-                        continue;
-                }
-                pmd = (pmd_t *)info->alloc_pgt_page(info->context);
-                if (!pmd)
-                        return -ENOMEM;
-                ident_pmd_init(info->pmd_flag, pmd, addr, next);
-                set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE));
-        }
-        return 0;
-}
-int kernel_ident_mapping_init(struct x86_mapping_info *info, pgd_t *pgd_page,
-                              unsigned long addr, unsigned long end)
-{
-        unsigned long next;
-        int result;
-        int off = info->kernel_mapping ? pgd_index(__PAGE_OFFSET) : 0;
-        for (; addr < end; addr = next) {
-                pgd_t *pgd = pgd_page + pgd_index(addr) + off;
-                pud_t *pud;
-                next = (addr & PGDIR_MASK) + PGDIR_SIZE;
-                if (next > end)
-                        next = end;
-                if (pgd_present(*pgd)) {
-                        pud = pud_offset(pgd, 0);
-                        result = ident_pud_init(info, pud, addr, next);
-                        if (result)
-                                return result;
-                        continue;
-                }
-                pud = (pud_t *)info->alloc_pgt_page(info->context);
-                if (!pud)
-                        return -ENOMEM;
-                result = ident_pud_init(info, pud, addr, next);
-                if (result)
-                        return result;
-                set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE));
-        }
-        return 0;
-}
 /*
 * NOTE: pagetable_init alloc all the fixmap pagetables contiguous on the

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 89d97477c1d9..bce2e5d9edd4 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c
@@ -58,79 +58,7 @@
58		58
59	#include "mm_internal.h"	59	#include "mm_internal.h"
60		60
61	static void ident_pmd_init(unsigned long pmd_flag, pmd_t *pmd_page,	61	#include "ident_map.c"
62	unsigned long addr, unsigned long end)
63	{
64	addr &= PMD_MASK;
65	for (; addr < end; addr += PMD_SIZE) {
66	pmd_t *pmd = pmd_page + pmd_index(addr);
67
68	if (!pmd_present(*pmd))
69	set_pmd(pmd, __pmd(addr \| pmd_flag));
70	}
71	}
72	static int ident_pud_init(struct x86_mapping_info info, pud_t pud_page,
73	unsigned long addr, unsigned long end)
74	{
75	unsigned long next;
76
77	for (; addr < end; addr = next) {
78	pud_t *pud = pud_page + pud_index(addr);
79	pmd_t *pmd;
80
81	next = (addr & PUD_MASK) + PUD_SIZE;
82	if (next > end)
83	next = end;
84
85	if (pud_present(*pud)) {
86	pmd = pmd_offset(pud, 0);
87	ident_pmd_init(info->pmd_flag, pmd, addr, next);
88	continue;
89	}
90	pmd = (pmd_t *)info->alloc_pgt_page(info->context);
91	if (!pmd)
92	return -ENOMEM;
93	ident_pmd_init(info->pmd_flag, pmd, addr, next);
94	set_pud(pud, __pud(__pa(pmd) \| _KERNPG_TABLE));
95	}
96
97	return 0;
98	}
99
100	int kernel_ident_mapping_init(struct x86_mapping_info info, pgd_t pgd_page,
101	unsigned long addr, unsigned long end)
102	{
103	unsigned long next;
104	int result;
105	int off = info->kernel_mapping ? pgd_index(__PAGE_OFFSET) : 0;
106
107	for (; addr < end; addr = next) {
108	pgd_t *pgd = pgd_page + pgd_index(addr) + off;
109	pud_t *pud;
110
111	next = (addr & PGDIR_MASK) + PGDIR_SIZE;
112	if (next > end)
113	next = end;
114
115	if (pgd_present(*pgd)) {
116	pud = pud_offset(pgd, 0);
117	result = ident_pud_init(info, pud, addr, next);
118	if (result)
119	return result;
120	continue;
121	}
122
123	pud = (pud_t *)info->alloc_pgt_page(info->context);
124	if (!pud)
125	return -ENOMEM;
126	result = ident_pud_init(info, pud, addr, next);
127	if (result)
128	return result;
129	set_pgd(pgd, __pgd(__pa(pud) \| _KERNPG_TABLE));
130	}
131
132	return 0;
133	}
134		62
135	/*	63	/*
136	* NOTE: pagetable_init alloc all the fixmap pagetables contiguous on the	64	* NOTE: pagetable_init alloc all the fixmap pagetables contiguous on the