The original kernel still exists in the memory, clear it now.

Signed-off-by: Jason Yan <[email protected]>
Cc: Scott Wood <[email protected]>
Cc: Diana Craciun <[email protected]>
Cc: Michael Ellerman <[email protected]>
Cc: Christophe Leroy <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Nicholas Piggin <[email protected]>
Cc: Kees Cook <[email protected]>
---
 arch/powerpc/mm/nohash/kaslr_booke.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/mm/nohash/kaslr_booke.c 
b/arch/powerpc/mm/nohash/kaslr_booke.c
index c6f5c1db1394..ed1277059368 100644
--- a/arch/powerpc/mm/nohash/kaslr_booke.c
+++ b/arch/powerpc/mm/nohash/kaslr_booke.c
@@ -378,8 +378,10 @@ notrace void __init kaslr_early_init(void *dt_ptr, 
phys_addr_t size)
        unsigned int *__kaslr_offset = (unsigned int *)(KERNELBASE + 0x58);
        unsigned int *__run_at_load = (unsigned int *)(KERNELBASE + 0x5c);
 
-       if (*__run_at_load == 1)
+       if (*__run_at_load == 1) {
+               kaslr_late_init();
                return;
+       }
 
        /* Setup flat device-tree pointer */
        initial_boot_params = dt_ptr;
-- 
2.17.2

Reply via email to