Skip to content

Commit 1e2dd57

Browse files
KAGA-KOKObp3tk0v
authored andcommitted
x86/boot: Use __pa_nodebug() in mk_early_pgtbl_32()
Use the existing macro instead of undefining and redefining __pa(). No functional change. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/r/20231017211722.051625827@linutronix.de
1 parent 242db75 commit 1e2dd57

1 file changed

Lines changed: 6 additions & 10 deletions

File tree

arch/x86/kernel/head32.c

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,25 +73,21 @@ void __init mk_early_pgtbl_32(void);
7373

7474
void __init __no_stack_protector mk_early_pgtbl_32(void)
7575
{
76-
#ifdef __pa
77-
#undef __pa
78-
#endif
79-
#define __pa(x) ((unsigned long)(x) - PAGE_OFFSET)
8076
pte_t pte, *ptep;
8177
int i;
8278
unsigned long *ptr;
8379
/* Enough space to fit pagetables for the low memory linear map */
84-
const unsigned long limit = __pa(_end) +
80+
const unsigned long limit = __pa_nodebug(_end) +
8581
(PAGE_TABLE_SIZE(LOWMEM_PAGES) << PAGE_SHIFT);
8682
#ifdef CONFIG_X86_PAE
87-
pmd_t pl2, *pl2p = (pmd_t *)__pa(initial_pg_pmd);
83+
pmd_t pl2, *pl2p = (pmd_t *)__pa_nodebug(initial_pg_pmd);
8884
#define SET_PL2(pl2, val) { (pl2).pmd = (val); }
8985
#else
90-
pgd_t pl2, *pl2p = (pgd_t *)__pa(initial_page_table);
86+
pgd_t pl2, *pl2p = (pgd_t *)__pa_nodebug(initial_page_table);
9187
#define SET_PL2(pl2, val) { (pl2).pgd = (val); }
9288
#endif
9389

94-
ptep = (pte_t *)__pa(__brk_base);
90+
ptep = (pte_t *)__pa_nodebug(__brk_base);
9591
pte.pte = PTE_IDENT_ATTR;
9692

9793
while ((pte.pte & PTE_PFN_MASK) < limit) {
@@ -111,11 +107,11 @@ void __init __no_stack_protector mk_early_pgtbl_32(void)
111107
pl2p++;
112108
}
113109

114-
ptr = (unsigned long *)__pa(&max_pfn_mapped);
110+
ptr = (unsigned long *)__pa_nodebug(&max_pfn_mapped);
115111
/* Can't use pte_pfn() since it's a call with CONFIG_PARAVIRT */
116112
*ptr = (pte.pte & PTE_PFN_MASK) >> PAGE_SHIFT;
117113

118-
ptr = (unsigned long *)__pa(&_brk_end);
114+
ptr = (unsigned long *)__pa_nodebug(&_brk_end);
119115
*ptr = (unsigned long)ptep + PAGE_OFFSET;
120116
}
121117

0 commit comments

Comments
 (0)