X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=lib%2Fiomap.c;h=d32229385151657397709988acd392208c8d83f9;hb=e071041be037eca208b62b84469a06bdfc692bea;hp=db004a9ff509bb6314793edcb76f48e785240e47;hpb=9f741cb8fecef923cce1dff820ac6aa78c12d136;p=safe%2Fjmp%2Flinux-2.6

diff --git a/lib/iomap.c b/lib/iomap.c
index db004a9..d322293 100644
--- a/lib/iomap.c
+++ b/lib/iomap.c
@@ -40,8 +40,7 @@ static void bad_io_access(unsigned long port, const char *access)
 	static int count = 10;
 	if (count) {
 		count--;
-		printk(KERN_ERR "Bad IO access at port %#lx (%s)\n", port, access);
-		WARN_ON(1);
+		WARN(1, KERN_ERR "Bad IO access at port %#lx (%s)\n", port, access);
 	}
 }
 
@@ -256,8 +255,8 @@ EXPORT_SYMBOL(ioport_unmap);
  * */
 void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
 {
-	unsigned long start = pci_resource_start(dev, bar);
-	unsigned long len = pci_resource_len(dev, bar);
+	resource_size_t start = pci_resource_start(dev, bar);
+	resource_size_t len = pci_resource_len(dev, bar);
 	unsigned long flags = pci_resource_flags(dev, bar);
 
 	if (!len || !start)