Commit 9f3a6284 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 26b08333 84a6fcb3

arch/mips/bcm47xx/prom.c

+8 −0
Original line number Diff line number Diff line
@@ -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);

}

arch/mips/mm/highmem.c

+1 −0
Original line number Diff line number Diff line 
#include <linux/module.h>

#include <linux/highmem.h>

#include <linux/sched.h>

#include <linux/smp.h>

#include <asm/fixmap.h>

#include <asm/tlbflush.h>