diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
index 2b6599807026..bdce6321fabd 100644
--- a/arch/x86/kernel/head32.c
+++ b/arch/x86/kernel/head32.c
@@ -79,6 +79,29 @@ typedef pgd_t			pl2_t;
 #define SET_PL2(val)		{ .pgd = (val), }
 #endif
 
+static __init __no_stack_protector pte_t init_map(pte_t pte, pte_t **ptep, pl2_t **pl2p,
+						  const unsigned long limit)
+{
+	while ((pte.pte & PTE_PFN_MASK) < limit) {
+		pl2_t pl2 = SET_PL2((unsigned long)*ptep | PDE_IDENT_ATTR);
+		int i;
+
+		**pl2p = pl2;
+		if (!IS_ENABLED(CONFIG_X86_PAE)) {
+			/* Kernel PDE entry */
+			*(*pl2p + ((PAGE_OFFSET >> PGDIR_SHIFT))) = pl2;
+		}
+
+		for (i = 0; i < PTRS_PER_PTE; i++) {
+			**ptep = pte;
+			pte.pte += PAGE_SIZE;
+			(*ptep)++;
+		}
+		(*pl2p)++;
+	}
+	return pte;
+}
+
 void __init __no_stack_protector mk_early_pgtbl_32(void)
 {
 	/* Enough space to fit pagetables for the low memory linear map */
@@ -87,27 +110,9 @@ void __init __no_stack_protector mk_early_pgtbl_32(void)
 	pte_t pte, *ptep = (pte_t *)__pa_nodebug(__brk_base);
 	pl2_t *pl2p = (pl2_t *)__pa_nodebug(pl2_base);
 	unsigned long *ptr;
-	int i;
 
 	pte.pte = PTE_IDENT_ATTR;
-
-	while ((pte.pte & PTE_PFN_MASK) < limit) {
-		pl2_t pl2 = SET_PL2((unsigned long)ptep | PDE_IDENT_ATTR);
-
-		*pl2p = pl2;
-
-		if (!IS_ENABLED(CONFIG_X86_PAE)) {
-			/* Kernel PDE entry */
-			*(pl2p +  ((PAGE_OFFSET >> PGDIR_SHIFT))) = pl2;
-		}
-
-		for (i = 0; i < PTRS_PER_PTE; i++) {
-			*ptep = pte;
-			pte.pte += PAGE_SIZE;
-			ptep++;
-		}
-		pl2p++;
-	}
+	pte = init_map(pte, &ptep, &pl2p, limit);
 
 	ptr = (unsigned long *)__pa_nodebug(&max_pfn_mapped);
 	/* Can't use pte_pfn() since it's a call with CONFIG_PARAVIRT */
@@ -116,4 +121,3 @@ void __init __no_stack_protector mk_early_pgtbl_32(void)
 	ptr = (unsigned long *)__pa_nodebug(&_brk_end);
 	*ptr = (unsigned long)ptep + PAGE_OFFSET;
 }
-