Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc48bad5 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Michael Ellerman
Browse files

powerpc/64/kexec: NULL check "clear_all" in kexec_sequence 



With Radix, it can be NULL even on !BOOKE these days so replace
the ifdef with a NULL check which is cleaner anyway.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Acked-by: default avatarBalbir Singh <bsingharora@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent ef24ba70

arch/powerpc/kernel/misc_64.S

+4 −3
Original line number Diff line number Diff line
@@ -660,7 +660,9 @@ _GLOBAL(kexec_sequence) 
	li	r6,1

	stw	r6,kexec_flag-1b(5)



#ifndef CONFIG_PPC_BOOK3E

	cmpdi	r27,0

	beq	1f



	/* clear out hardware hash page table and tlb */

#ifdef PPC64_ELF_ABI_v1

	ld	r12,0(r27)		/* deref function descriptor */
@@ -669,7 +671,6 @@ _GLOBAL(kexec_sequence) 
#endif

	mtctr	r12

	bctrl				/* mmu_hash_ops.hpte_clear_all(void); */

#endif /* !CONFIG_PPC_BOOK3E */



/*

 *   kexec image calling is:
@@ -696,7 +697,7 @@ _GLOBAL(kexec_sequence) 
 *    are the boot cpu ?????

 *    other device tree differences (prop sizes, va vs pa, etc)...

 */

	mr	r3,r25	# my phys cpu

1:	mr	r3,r25	# my phys cpu

	mr	r4,r30	# start, aka phys mem offset

	mtlr	4

	li	r5,0