Merge branch 'master' of git://git.denx.de/u-boot-mips

[karo-tx-uboot.git] / cpu / mpc512x / traps.c

diff --git a/cpu/mpc512x/traps.c b/cpu/mpc512x/traps.c
index 8455c92761b109b9d9130dddc5510c753e14c9e6..8000fabd4ade826f19401cfc71942e56384c8535 100644 (file)
--- a/cpu/mpc512x/traps.c
+++ b/cpu/mpc512x/traps.c
@@ -34,7 +34,13 @@ DECLARE_GLOBAL_DATA_PTR;
 
 extern unsigned long search_exception_table(unsigned long);
 
-#define END_OF_MEM     (gd->bd->bi_memstart + gd->bd->bi_memsize)
+/*
+ * End of addressable memory.  This may be less than the actual
+ * 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())
 
 /*
  * Trap & Exception support