From: Kyle McMartin <kyle@parisc-linux.org>
Date: Sat, 17 Feb 2007 05:18:23 +0000 (-0500)
Subject: Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git
X-Git-Tag: v2.6.21-rc2~35^2~47
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7;p=linux.git

Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git

Conflicts:

	arch/parisc/hpux/sys_hpux.c
	arch/parisc/mm/ioremap.c
---

e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7
diff --cc arch/parisc/mm/ioremap.c
index 44b42c7f639d,6c6102307c06..92d496ad07c9
--- a/arch/parisc/mm/ioremap.c
+++ b/arch/parisc/mm/ioremap.c
@@@ -26,10 -128,9 +26,10 @@@
   */
  void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags)
  {
- 	void *addr;
+ 	void __iomem *addr;
  	struct vm_struct *area;
  	unsigned long offset, last_addr;
 +	pgprot_t pgprot;
  
  #ifdef CONFIG_EISA
  	unsigned long end = phys_addr + size - 1;
@@@ -80,9 -178,8 +80,9 @@@
  	if (!area)
  		return NULL;
  
- 	addr = area->addr;
+ 	addr = (void __iomem *) area->addr;
 -	if (remap_area_pages((unsigned long) addr, phys_addr, size, flags)) {
 +	if (ioremap_page_range((unsigned long)addr, (unsigned long)addr + size,
 +			       phys_addr, pgprot)) {
  		vfree(addr);
  		return NULL;
  	}