diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-22 19:51:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-22 19:51:39 -0800 |
| commit | 9f3a6284880ceea452903e2043c88d7226736318 (patch) | |
| tree | 2f9b65b58bf782ac59d3ee59a5f5a10da5aaca04 | |
| parent | 26b0833366c2521b890dfa8cb0e922be7debed37 (diff) | |
| parent | 84a6fcb368a080620d12fc4d79e07902dbee7335 (diff) | |
| download | linux-9f3a6284880ceea452903e2043c88d7226736318.tar.bz2 | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: BCM47xx: Fix 128MB RAM support
MIPS: Highmem: Fix build error
| -rw-r--r-- | arch/mips/bcm47xx/prom.c | 8 | ||||
| -rw-r--r-- | arch/mips/mm/highmem.c | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/mips/bcm47xx/prom.c b/arch/mips/bcm47xx/prom.c index c51405e57921..29d3cbf9555f 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); } diff --git a/arch/mips/mm/highmem.c b/arch/mips/mm/highmem.c index e274fda329f4..127d732474bf 100644 --- a/arch/mips/mm/highmem.c +++ b/arch/mips/mm/highmem.c @@ -1,5 +1,6 @@ #include <linux/module.h> #include <linux/highmem.h> +#include <linux/sched.h> #include <linux/smp.h> #include <asm/fixmap.h> #include <asm/tlbflush.h> |