Messages in this thread | | | Date | Fri, 3 Dec 2021 09:57:35 +0100 | Subject | Re: [PATCH 3/5] riscv: mm: init: remove _pt_ops and use pt_ops directly | From | Alexandre ghiti <> |
| |
On 12/3/21 06:03, Jisheng Zhang wrote: > Except "pt_ops", other global vars when CONFIG_XIP_KERNEL=y is defined > as below: > > |foo_type foo; > |#ifdef CONFIG_XIP_KERNEL > |#define foo (*(foo_type *)XIP_FIXUP(&foo)) > |#endif > > Follow the same way for pt_ops to unify the style and to simplify code.
_dtb_early_pa and _dtb_early_va have the same 'issue' too. I thought there was a reason for those variables to be declared this way but I can't find it :)
> > Signed-off-by: Jisheng Zhang <jszhang@kernel.org> > --- > arch/riscv/mm/init.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c > index bd445ac778a8..4d4fcd7ef1a9 100644 > --- a/arch/riscv/mm/init.c > +++ b/arch/riscv/mm/init.c > @@ -227,12 +227,10 @@ static void __init setup_bootmem(void) > } > > #ifdef CONFIG_MMU > -static struct pt_alloc_ops _pt_ops __initdata; > +static struct pt_alloc_ops pt_ops __initdata; > > #ifdef CONFIG_XIP_KERNEL > -#define pt_ops (*(struct pt_alloc_ops *)XIP_FIXUP(&_pt_ops)) > -#else > -#define pt_ops _pt_ops > +#define pt_ops (*(struct pt_alloc_ops *)XIP_FIXUP(&pt_ops)) > #endif > > unsigned long riscv_pfn_base __ro_after_init;
| |