Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / powerpc / cpu / mpc85xx / traps.c

diff --git a/arch/powerpc/cpu/mpc85xx/traps.c b/arch/powerpc/cpu/mpc85xx/traps.c
index 3ef6e4ae160ffc2bd8739bb6c229ec13f1d09557..f37a45e2694ed4ec6720cdccedee2cf74e02f3df 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/traps.c
+++ b/arch/powerpc/cpu/mpc85xx/traps.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * linux/arch/powerpc/kernel/traps.c
  *
@@ -12,8 +13,6 @@
  *
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -21,7 +20,10 @@
  */
 
 #include <common.h>
+#include <asm/ptrace.h>
 #include <command.h>
+#include <init.h>
+#include <irq_func.h>
 #include <kgdb.h>
 #include <asm/processor.h>
 
@@ -35,7 +37,6 @@ extern unsigned long search_exception_table(unsigned long);
  * amount of memory on the system if we're unable to keep all
  * the memory mapped in.
  */
-extern ulong get_effective_memsize(void);
 #define END_OF_MEM (gd->bd->bi_memstart + get_effective_memsize())
 
 static __inline__ void set_tsr(unsigned long val)
@@ -287,11 +288,3 @@ void DebugException(struct pt_regs *regs)
        do_bedbug_breakpoint( regs );
 #endif
 }
-
-/* Probe an address by reading.         If not present, return -1, otherwise
- * return 0.
- */
-int addr_probe(uint *addr)
-{
-       return 0;
-}