---

yaml --- r: 24818 b: refs/heads/master c: cb4ab59 h: refs/heads/master v: v3
git-mirror · Mar 30, 2006 · efcd988 · efcd988
1 parent 90688d2
commit efcd988
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29ef8295327653ff09a56285c35213cd31fa54b3
+refs/heads/master: cb4ab59cd6136f6ad6b3513054ac969fea02dfc6
diff --git a/trunk/arch/parisc/mm/ioremap.c b/trunk/arch/parisc/mm/ioremap.c
@@ -152,20 +152,21 @@ EXPORT_SYMBOL(__raw_bad_addr);
  */
 void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags)
 {
+	void *addr;
+	struct vm_struct *area;
+	unsigned long offset, last_addr;
+
 #ifdef CONFIG_EISA
-	#error FIXME.
 	unsigned long end = phys_addr + size - 1;
 	/* Support EISA addresses */
 	if ((phys_addr >= 0x00080000 && end < 0x000fffff)
 			|| (phys_addr >= 0x00500000 && end < 0x03bfffff)) {
 		phys_addr |= 0xfc000000;
+#warning "FIXME: EISA regions do not work yet..."
+		return NULL;  /* XXX */
 	}
 #endif
 
-	void *addr;
-	struct vm_struct *area;
-	unsigned long offset, last_addr;
-
 	/* Don't allow wraparound or zero size */
 	last_addr = phys_addr + size - 1;
 	if (!size || last_addr < phys_addr)