diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2010-05-12 23:19:01 +0200 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-05-12 23:20:33 +0200 |
| commit | a9aa1d02de36b450990b0e25a88fc2ff1c3e6b94 (patch) | |
| tree | 1f9d19f1642d263e65906a916a48be9339accc73 /arch/mips/bcm47xx/prom.c | |
| parent | 5671a10e2bc7f99d9157c6044faf8be2ef302361 (diff) | |
| parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff) | |
| download | kernel_samsung_tuna-a9aa1d02de36b450990b0e25a88fc2ff1c3e6b94.zip kernel_samsung_tuna-a9aa1d02de36b450990b0e25a88fc2ff1c3e6b94.tar.gz kernel_samsung_tuna-a9aa1d02de36b450990b0e25a88fc2ff1c3e6b94.tar.bz2 | |
Merge commit 'v2.6.34-rc7' into perf/nmi
Merge reason: catch up with latest softlockup detector changes.
Diffstat (limited to 'arch/mips/bcm47xx/prom.c')
| -rw-r--r-- | arch/mips/bcm47xx/prom.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/mips/bcm47xx/prom.c b/arch/mips/bcm47xx/prom.c index c51405e..0fa646c 100644 --- a/arch/mips/bcm47xx/prom.c +++ b/arch/mips/bcm47xx/prom.c @@ -141,6 +141,14 @@ static __init void prom_init_mem(void) break; } + /* Ignoring the last page when ddr size is 128M. Cached + * accesses to last page is causing the processor to prefetch + * using address above 128M stepping out of the ddr address + * space. + */ + if (mem == 0x8000000) + mem -= 0x1000; + add_memory_region(0, mem, BOOT_MEM_RAM); } @@ -155,4 +163,3 @@ void __init prom_init(void) void __init prom_free_prom_memory(void) { } - |