瀏覽代碼

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: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Benjamin Herrenschmidt 9 年之前
父節點
當前提交
3eabf88579
共有 1 個文件被更改,包括 0 次插入16 次删除
  1. 0 16
      arch/powerpc/kernel/machine_kexec_64.c

+ 0 - 16
arch/powerpc/kernel/machine_kexec_64.c

@@ -32,21 +32,6 @@
 #include <asm/hw_breakpoint.h>
 #include <asm/hw_breakpoint.h>
 #include <asm/asm-prototypes.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 default_machine_kexec_prepare(struct kimage *image)
 {
 {
 	int i;
 	int i;
@@ -86,7 +71,6 @@ int default_machine_kexec_prepare(struct kimage *image)
 
 
 	return 0;
 	return 0;
 }
 }
-#endif /* !CONFIG_PPC_BOOK3E */
 
 
 static void copy_segments(unsigned long ind)
 static void copy_segments(unsigned long ind)
 {
 {