Update of /cvsroot/gc-linux/linux/arch/powerpc/mm
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17071/arch/powerpc/mm
Modified Files:
pgtable_32.c
Log Message:
Rewind to v2.6.31.
Index: pgtable_32.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/mm/pgtable_32.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** pgtable_32.c 25 Oct 2009 18:59:27 -0000 1.8
--- pgtable_32.c 9 Dec 2009 18:18:06 -0000 1.9
***************
*** 193,209 ****
*/
if (mem_init_done && (p < virt_to_phys(high_memory))) {
! /*
! * On some systems, though, we may want to remap normal RAM
! * that we have memreserve'd at the device tree.
! * But we can't do that safely if we are using BATs.
! *
! */
! if (!__map_without_bats) {
! printk(KERN_WARNING
! "__ioremap(): phys addr 0x%llx is RAM lr %p\n",
! (unsigned long long)p,
! __builtin_return_address(0));
! return NULL;
! }
}
#endif
--- 193,199 ----
*/
if (mem_init_done && (p < virt_to_phys(high_memory))) {
! printk("__ioremap(): phys addr 0x%llx is RAM lr %p\n",
! (unsigned long long)p, __builtin_return_address(0));
! return NULL;
}
#endif
|
