Skip to contentSkip to conversation

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

PATCH In review Benjamin Herrenschmidt 1 participant 1 message Jul 6, 2016 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 4/4 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).

---
Currently only compile tested

 arch/powerpc/kernel/machine_kexec_64.c | 16 ----------------
 1 file changed, 16 deletions(-)
arch/powerpc/kernel/machine_kexec_64.c +0 -16
index 77fcc34..a44ffe5 100644
@@ -31,21 +31,6 @@
 #include <asm/hw_breakpoint.h>
 #include <asm/firmware.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;
@@ -85,7 +70,6 @@ int default_machine_kexec_prepare(struct kimage *image)
 
 	return 0;
 }
-#endif /* !CONFIG_PPC_BOOK3E */
 
 static void copy_segments(unsigned long ind)
 {