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

torvalds · torvalds · commit 9f3a6284880c · 2010-02-22T19:51:39.000-08:00
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: BCM47xx: Fix 128MB RAM support
  MIPS: Highmem: Fix build error
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>

Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,14 @@ static __init void prom_init_mem(void)`
`141`	`141`	`break;`
`142`	`142`	`}`
`143`	`143`
	`144`	`+ /* Ignoring the last page when ddr size is 128M. Cached`
	`145`	`+ * accesses to last page is causing the processor to prefetch`
	`146`	`+ * using address above 128M stepping out of the ddr address`
	`147`	`+ * space.`
	`148`	`+ */`
	`149`	`+ if (mem == 0x8000000)`
	`150`	`+ mem -= 0x1000;`
	`151`	`+`
`144`	`152`	`add_memory_region(0, mem, BOOT_MEM_RAM);`
`145`	`153`	`}`
`146`	`154`