Context |
Check |
Description |
snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch powerpc/merge (3b4852888d3f7e0cde65b29af9c518f4019e145f)
|
snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch powerpc/next (565f9bc05e2dad6c7fdfc7c2e641be580aa599cd)
|
snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch linus/master (96b95eff4a591dbac582c2590d067e356a18aacb)
|
snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch powerpc/fixes (7d6475051fb3d9339c5c760ed9883bc0a9048b21)
|
snowpatch_ozlabs/apply_patch |
success
|
Successfully applied on branch linux-next (5a6fcbeabe3e20459ed8504690b2515dacc5246f)
|
snowpatch_ozlabs/checkpatch |
success
|
total: 0 errors, 0 warnings, 0 checks, 11 lines checked
|
snowpatch_ozlabs/needsstable |
success
|
Patch has no Fixes tags
|
@@ -377,8 +377,10 @@ notrace void __init kaslr_early_init(void *dt_ptr, phys_addr_t size)
#ifdef CONFIG_PPC64
unsigned int *__run_at_load = (unsigned int *)(KERNELBASE + 0x5c);
- if (*__run_at_load == 1)
+ if (*__run_at_load == 1) {
+ kaslr_late_init();
return;
+ }
*__run_at_load = 1;
The original kernel still exists in the memory, clear it now. Signed-off-by: Jason Yan <yanaijie@huawei.com> Cc: Scott Wood <oss@buserror.net> Cc: Diana Craciun <diana.craciun@nxp.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Christophe Leroy <christophe.leroy@c-s.fr> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Nicholas Piggin <npiggin@gmail.com> Cc: Kees Cook <keescook@chromium.org> --- arch/powerpc/mm/nohash/kaslr_booke.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)