Merge branch 'upstream' of git:https://ftp.linux-mips.org/pub/scm/upstream-…

…linus * 'upstream' of git:https://ftp.linux-mips.org/pub/scm/upstream-linus: MIPS: BCM47xx: Fix 128MB RAM support MIPS: Highmem: Fix build error
torvalds · Feb 23, 2010 · 9f3a628 · 9f3a628
2 parents 26b0833 + 84a6fcb
commit 9f3a628
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git 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
@@ -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>