vserver 1.9.3

[linux-2.6.git] / drivers / char / agp / hp-agp.c

diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c
index 5fd2adc..323a6b6 100644 (file)
--- a/drivers/char/agp/hp-agp.c
+++ b/drivers/char/agp/hp-agp.c
@@ -59,8 +59,8 @@ static struct gatt_mask hp_zx1_masks[] =
 };
 
 static struct _hp_private {
-       volatile u8 *ioc_regs;
-       volatile u8 *lba_regs;
+       volatile u8 __iomem *ioc_regs;
+       volatile u8 __iomem *lba_regs;
        int lba_cap_offset;
        u64 *io_pdir;           // PDIR for entire IOVA
        u64 *gatt;              // PDIR just for GART (subset of above)
@@ -97,7 +97,7 @@ static int __init hp_zx1_ioc_shared(void)
                default:
                        printk(KERN_ERR PFX "Invalid IOTLB page size "
                               "configuration 0x%x\n", hp->io_tlb_ps);
-                       hp->gatt = 0;
+                       hp->gatt = NULL;
                        hp->gatt_entries = 0;
                        return -ENODEV;
        }
@@ -115,7 +115,7 @@ static int __init hp_zx1_ioc_shared(void)
 
        if (hp->gatt[0] != HP_ZX1_SBA_IOMMU_COOKIE) {
                /* Normal case when no AGP device in system */
-               hp->gatt = 0;
+               hp->gatt = NULL;
                hp->gatt_entries = 0;
                printk(KERN_ERR PFX "No reserved IO PDIR entry found; "
                       "GART disabled\n");
@@ -183,7 +183,7 @@ hp_zx1_ioc_init (u64 hpa)
 }
 
 static int
-hp_zx1_lba_find_capability (volatile u8 *hpa, int cap)
+hp_zx1_lba_find_capability (volatile u8 __iomem *hpa, int cap)
 {
        u16 status;
        u8 pos, id;
@@ -267,10 +267,10 @@ hp_zx1_cleanup (void)
        if (hp->ioc_regs) {
                if (hp->io_pdir_owner)
                        OUTREG64(hp->ioc_regs, HP_ZX1_IBASE, 0);
-               iounmap((void *) hp->ioc_regs);
+               iounmap(hp->ioc_regs);
        }
        if (hp->lba_regs)
-               iounmap((void *) hp->lba_regs);
+               iounmap(hp->lba_regs);
 }
 
 static void
@@ -294,7 +294,7 @@ hp_zx1_create_gatt_table (void)
                if (!hp->io_pdir) {
                        printk(KERN_ERR PFX "Couldn't allocate contiguous "
                                "memory for I/O PDIR\n");
-                       hp->gatt = 0;
+                       hp->gatt = NULL;
                        hp->gatt_entries = 0;
                        return -ENOMEM;
                }