From: Becky Bruce Date: Wed, 14 May 2008 18:09:58 +0000 (-0500) Subject: MPC86xx: Change traps.c to not reference non-addressable memory X-Git-Tag: v1.3.4-rc1~112^2 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=279726bd00558e80263d44581c44167625b7fb9a;p=u-boot MPC86xx: Change traps.c to not reference non-addressable memory Currently, END_OF_RAM is used by the trap code to determine if we should attempt to access the stack pointer or not. However, on systems with a lot of RAM, only a subset of the RAM is guaranteed to be mapped in and accessible. Change END_OF_RAM to use get_effective_memsize() instead of using the raw ram size out of the bd to prevent us from trying to access non-mapped memory. Signed-off-by: Becky Bruce --- diff --git a/cpu/mpc86xx/traps.c b/cpu/mpc86xx/traps.c index 04c2e1331b..5695c3e453 100644 --- a/cpu/mpc86xx/traps.c +++ b/cpu/mpc86xx/traps.c @@ -43,7 +43,13 @@ int (*debugger_exception_handler)(struct pt_regs *) = 0; /* Returns 0 if exception not found and fixup otherwise. */ 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