summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-22 19:51:39 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-22 19:51:39 -0800
commit9f3a6284880ceea452903e2043c88d7226736318 (patch)
tree2f9b65b58bf782ac59d3ee59a5f5a10da5aaca04 /arch
parent26b0833366c2521b890dfa8cb0e922be7debed37 (diff)
parent84a6fcb368a080620d12fc4d79e07902dbee7335 (diff)
downloadlinux-3.10-9f3a6284880ceea452903e2043c88d7226736318.tar.gz
linux-3.10-9f3a6284880ceea452903e2043c88d7226736318.tar.bz2
linux-3.10-9f3a6284880ceea452903e2043c88d7226736318.zip
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
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/bcm47xx/prom.c8
-rw-r--r--arch/mips/mm/highmem.c1
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/mips/bcm47xx/prom.c b/arch/mips/bcm47xx/prom.c
index c51405e5792..29d3cbf9555 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 e274fda329f..127d732474b 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>