[Gc-linux-cvs] linux/arch/powerpc/mm pgtable_32.c,1.10,1.11

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/arch/powerpc/mm
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22540/arch/powerpc/mm

Modified Files:
	pgtable_32.c 
Log Message:
Merge v2.6.32.

Index: pgtable_32.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/mm/pgtable_32.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pgtable_32.c	9 Dec 2009 18:40:09 -0000	1.10
--- pgtable_32.c	9 Dec 2009 18:44:54 -0000	1.11
***************
*** 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
--- 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