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

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

powerpc/64/kexec: Remove BookE special default_machine_kexec_prepare() 



The only difference is now the TCE table check which doesn't need
to be ifdef'ed out, it will basically do nothing on BookE (it is
only useful for ancient IBM machines).

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

arch/powerpc/kernel/machine_kexec_64.c

+0 −16
Original line number Diff line number Diff line
@@ -32,21 +32,6 @@ 
#include <asm/hw_breakpoint.h>

#include <asm/asm-prototypes.h>



#ifdef CONFIG_PPC_BOOK3E

int default_machine_kexec_prepare(struct kimage *image)

{

	int i;

	/*

	 * Since we use the kernel fault handlers and paging code to

	 * handle the virtual mode, we must make sure no destination

	 * overlaps kernel static data or bss.

	 */

	for (i = 0; i < image->nr_segments; i++)

		if (image->segment[i].mem < __pa(_end))

			return -ETXTBSY;

	return 0;

}

#else

int default_machine_kexec_prepare(struct kimage *image)

{

	int i;
@@ -86,7 +71,6 @@ int default_machine_kexec_prepare(struct kimage *image) 


	return 0;

}

#endif /* !CONFIG_PPC_BOOK3E */



static void copy_segments(unsigned long ind)

{