[Gc-linux-cvs] linux/arch/powerpc/mm pgtable_32.c,1.4,1.5

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

Update of /cvsroot/gc-linux/linux/arch/powerpc/mm
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29988/arch/powerpc/mm

Modified Files:
	pgtable_32.c 
Log Message:
Forward to v.2.6.30.


Index: pgtable_32.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/mm/pgtable_32.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pgtable_32.c	25 Oct 2009 18:33:46 -0000	1.4
--- pgtable_32.c	25 Oct 2009 18:45:35 -0000	1.5
***************
*** 130,134 ****
  ioremap(phys_addr_t addr, unsigned long size)
  {
! 	return __ioremap(addr, size, _PAGE_NO_CACHE | _PAGE_GUARDED);
  }
  EXPORT_SYMBOL(ioremap);
--- 130,135 ----
  ioremap(phys_addr_t addr, unsigned long size)
  {
! 	return __ioremap_caller(addr, size, _PAGE_NO_CACHE | _PAGE_GUARDED,
! 				__builtin_return_address(0));
  }
  EXPORT_SYMBOL(ioremap);
***************
*** 144,148 ****
  	flags &= ~(_PAGE_USER | _PAGE_EXEC | _PAGE_HWEXEC);
  
! 	return __ioremap(addr, size, flags);
  }
  EXPORT_SYMBOL(ioremap_flags);
--- 145,149 ----
  	flags &= ~(_PAGE_USER | _PAGE_EXEC | _PAGE_HWEXEC);
  
! 	return __ioremap_caller(addr, size, flags, __builtin_return_address(0));
  }
  EXPORT_SYMBOL(ioremap_flags);
***************
*** 151,154 ****
--- 152,162 ----
  __ioremap(phys_addr_t addr, unsigned long size, unsigned long flags)
  {
+ 	return __ioremap_caller(addr, size, flags, __builtin_return_address(0));
+ }
+ 
+ void __iomem *
+ __ioremap_caller(phys_addr_t addr, unsigned long size, unsigned long flags,
+ 		 void *caller)
+ {
  	unsigned long v, i;
  	phys_addr_t p;
***************
*** 157,161 ****
  	/* Make sure we have the base flags */
  	if ((flags & _PAGE_PRESENT) == 0)
! 		flags |= _PAGE_KERNEL;
  
  	/* Non-cacheable page cannot be coherent */
--- 165,169 ----
  	/* Make sure we have the base flags */
  	if ((flags & _PAGE_PRESENT) == 0)
! 		flags |= PAGE_KERNEL;
  
  	/* Non-cacheable page cannot be coherent */
***************
*** 213,217 ****
  	if (mem_init_done) {
  		struct vm_struct *area;
! 		area = get_vm_area(size, VM_IOREMAP);
  		if (area == 0)
  			return NULL;
--- 221,225 ----
  	if (mem_init_done) {
  		struct vm_struct *area;
! 		area = get_vm_area_caller(size, VM_IOREMAP, caller);
  		if (area == 0)
  			return NULL;
***************
*** 289,293 ****
  	for (; s < total_lowmem; s += PAGE_SIZE) {
  		ktext = ((char *) v >= _stext && (char *) v < etext);
! 		f = ktext ?_PAGE_RAM_TEXT : _PAGE_RAM;
  		map_page(v, p, f);
  #ifdef CONFIG_PPC_STD_MMU_32
--- 297,301 ----
  	for (; s < total_lowmem; s += PAGE_SIZE) {
  		ktext = ((char *) v >= _stext && (char *) v < etext);
! 		f = ktext ? PAGE_KERNEL_TEXT : PAGE_KERNEL;
  		map_page(v, p, f);
  #ifdef CONFIG_PPC_STD_MMU_32
***************
*** 392,397 ****
  
  static int fixmaps;
- unsigned long FIXADDR_TOP = (-PAGE_SIZE);
- EXPORT_SYMBOL(FIXADDR_TOP);
  
  void __set_fixmap (enum fixed_addresses idx, phys_addr_t phys, pgprot_t flags)
--- 400,403 ----