From: Christophe Leroy Date: Fri, 9 Nov 2018 17:33:20 +0000 (+0000) Subject: powerpc/32: use patch_site_addr() in machine_init() X-Git-Tag: Ubuntu-5.13.0-19.19~9515^2~119 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=04b0a72f2807ba40b155fc1689e38569779527ca;p=mirror_ubuntu-jammy-kernel.git powerpc/32: use patch_site_addr() in machine_init() Use patch_site_addr() instead of hardcoding the address calculation in machine_init() Signed-off-by: Christophe Leroy Signed-off-by: Michael Ellerman --- diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index 972c98d1e208..be6ee8dec98d 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c @@ -101,8 +101,7 @@ notrace unsigned long __init early_init(unsigned long dt_ptr) */ notrace void __init machine_init(u64 dt_ptr) { - unsigned int *addr = (unsigned int *)((unsigned long)&patch__memset_nocache + - patch__memset_nocache); + unsigned int *addr = (unsigned int *)patch_site_addr(&patch__memset_nocache); unsigned long insn; /* Configure static keys first, now that we're relocated. */