16 files changed, 115 insertions, 68 deletions

diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index 7f8c1b53b754..486ed8a11b59 100644
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -27,7 +27,7 @@ config AGP
 
 config AGP_ALI
         tristate "ALI chipset support"
-        depends on AGP && X86 && !X86_64
+        depends on AGP && X86_32
         ---help---
           This option gives you AGP support for the GLX component of
           XFree86 4.x on the following ALi chipsets.  The supported chipsets
@@ -45,7 +45,7 @@ config AGP_ALI
 
 config AGP_ATI
         tristate "ATI chipset support"
-        depends on AGP && X86 && !X86_64
+        depends on AGP && X86_32
         ---help---
       This option gives you AGP support for the GLX component of
       XFree86 4.x on the ATI RadeonIGP family of chipsets.
@@ -55,7 +55,7 @@ config AGP_ATI
 
 config AGP_AMD
         tristate "AMD Irongate, 761, and 762 chipset support"
-        depends on AGP && X86 && !X86_64
+        depends on AGP && X86_32
         help
           This option gives you AGP support for the GLX component of
           XFree86 4.x on AMD Irongate, 761, and 762 chipsets.
@@ -91,7 +91,7 @@ config AGP_INTEL
 
 config AGP_NVIDIA
         tristate "NVIDIA nForce/nForce2 chipset support"
-        depends on AGP && X86 && !X86_64
+        depends on AGP && X86_32
         help
           This option gives you AGP support for the GLX component of
           XFree86 4.x on the following NVIDIA chipsets.  The supported chipsets
@@ -99,7 +99,7 @@ config AGP_NVIDIA
 
 config AGP_SIS
         tristate "SiS chipset support"
-        depends on AGP && X86 && !X86_64
+        depends on AGP && X86_32
         help
           This option gives you AGP support for the GLX component of
           XFree86 4.x on Silicon Integrated Systems [SiS] chipsets.
@@ -111,14 +111,14 @@ config AGP_SIS
 
 config AGP_SWORKS
         tristate "Serverworks LE/HE chipset support"
-        depends on AGP && X86 && !X86_64
+        depends on AGP && X86_32
         help
           Say Y here to support the Serverworks AGP card.  See 
           <http://www.serverworks.com/> for product descriptions and images.
 
 config AGP_VIA
         tristate "VIA chipset support"
-        depends on AGP && X86 && !X86_64
+        depends on AGP && X86_32
         help
           This option gives you AGP support for the GLX component of
           XFree86 4.x on VIA MVP3/Apollo Pro chipsets.
@@ -154,7 +154,7 @@ config AGP_UNINORTH
 
 config AGP_EFFICEON
         tristate "Transmeta Efficeon support"
-        depends on AGP && X86 && !X86_64
+        depends on AGP && X86_32
         help
           This option gives you AGP support for the Transmeta Efficeon
           series processors with integrated northbridges.
diff --git a/drivers/char/agp/ali-agp.c b/drivers/char/agp/ali-agp.c
index 9c9c9c2247ce..b02fc2267159 100644
--- a/drivers/char/agp/ali-agp.c
+++ b/drivers/char/agp/ali-agp.c
@@ -7,6 +7,7 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/agp_backend.h>
+#include <asm/page.h>           /* PAGE_SIZE */
 #include "agp.h"
 
 #define ALI_AGPCTRL     0xb8
diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c
index 3a41672e4d66..1f776651ac64 100644
--- a/drivers/char/agp/amd-k7-agp.c
+++ b/drivers/char/agp/amd-k7-agp.c
@@ -94,19 +94,16 @@ static int amd_create_gatt_pages(int nr_tables)
         int retval = 0;
         int i;
 
-        tables = kmalloc((nr_tables + 1) * sizeof(struct amd_page_map *),
-                         GFP_KERNEL);
+        tables = kzalloc((nr_tables + 1) * sizeof(struct amd_page_map *),GFP_KERNEL);
         if (tables == NULL)
                 return -ENOMEM;
 
-        memset (tables, 0, sizeof(struct amd_page_map *) * (nr_tables + 1));
         for (i = 0; i < nr_tables; i++) {
-                entry = kmalloc(sizeof(struct amd_page_map), GFP_KERNEL);
+                entry = kzalloc(sizeof(struct amd_page_map), GFP_KERNEL);
                 if (entry == NULL) {
                         retval = -ENOMEM;
                         break;
                 }
-                memset (entry, 0, sizeof(struct amd_page_map));
                 tables[i] = entry;
                 retval = amd_create_page_map(entry);
                 if (retval != 0)
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
index 0a7624a9b1c1..810679dcbbb0 100644
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
@@ -13,6 +13,8 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/agp_backend.h>
+#include <linux/mmzone.h>
+#include <asm/page.h>           /* PAGE_SIZE */
 #include "agp.h"
 
 /* Will need to be increased if AMD64 ever goes >8-way. */
@@ -55,9 +57,8 @@ static int nr_garts;
 static struct pci_dev * hammers[MAX_HAMMER_GARTS];
 
 static struct resource *aperture_resource;
-static int __initdata agp_try_unsupported;
+static int __initdata agp_try_unsupported = 1;
 
-static int gart_iterator;
 #define for_each_nb() for(gart_iterator=0;gart_iterator<nr_garts;gart_iterator++)
 
 static void flush_amd64_tlb(struct pci_dev *dev)
@@ -71,6 +72,7 @@ static void flush_amd64_tlb(struct pci_dev *dev)
 
 static void amd64_tlbflush(struct agp_memory *temp)
 {
+        int gart_iterator;
         for_each_nb()
                 flush_amd64_tlb(hammers[gart_iterator]);
 }
@@ -220,6 +222,7 @@ static struct aper_size_info_32 amd_8151_sizes[7] =
 static int amd_8151_configure(void)
 {
         unsigned long gatt_bus = virt_to_gart(agp_bridge->gatt_table_real);
+        int gart_iterator;
 
         /* Configure AGP regs in each x86-64 host bridge. */
         for_each_nb() {
@@ -233,7 +236,7 @@ static int amd_8151_configure(void)
 static void amd64_cleanup(void)
 {
         u32 tmp;
-
+        int gart_iterator;
         for_each_nb() {
                 /* disable gart translation */
                 pci_read_config_dword (hammers[gart_iterator], AMD64_GARTAPERTURECTL, &tmp);
@@ -413,7 +416,7 @@ static void __devinit amd8151_init(struct pci_dev *pdev, struct agp_bridge_data
 }
 
 
-static struct aper_size_info_32 uli_sizes[7] =
+static const struct aper_size_info_32 uli_sizes[7] =
 {
         {256, 65536, 6, 10},
         {128, 32768, 5, 9},
@@ -467,7 +470,7 @@ static int __devinit uli_agp_init(struct pci_dev *pdev)
 }
 
 
-static struct aper_size_info_32 nforce3_sizes[5] =
+static const struct aper_size_info_32 nforce3_sizes[5] =
 {
         {512,  131072, 7, 0x00000000 },
         {256,  65536,  6, 0x00000008 },
@@ -695,6 +698,16 @@ static struct pci_device_id agp_amd64_pci_table[] = {
         .subvendor      = PCI_ANY_ID,
         .subdevice      = PCI_ANY_ID,
         },
+        /* ALI/ULI M1695 */
+        {
+        .class          = (PCI_CLASS_BRIDGE_HOST << 8),
+        .class_mask     = ~0,
+        .vendor         = PCI_VENDOR_ID_AL,
+        .device         = 0x1689,
+        .subvendor      = PCI_ANY_ID,
+        .subdevice      = PCI_ANY_ID,
+        },
+
         { }
 };
 
diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
index e572ced9100a..53372a83b675 100644
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -6,6 +6,8 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include <linux/agp_backend.h>
 #include <asm/agp.h>
 #include "agp.h"
@@ -116,14 +118,12 @@ static int ati_create_gatt_pages(int nr_tables)
         int retval = 0;
         int i;
 
-        tables = kmalloc((nr_tables + 1) * sizeof(ati_page_map *),
-                         GFP_KERNEL);
+        tables = kzalloc((nr_tables + 1) * sizeof(ati_page_map *),GFP_KERNEL);
         if (tables == NULL)
                 return -ENOMEM;
 
-        memset(tables, 0, sizeof(ati_page_map *) * (nr_tables + 1));
         for (i = 0; i < nr_tables; i++) {
-                entry = kmalloc(sizeof(ati_page_map), GFP_KERNEL);
+                entry = kzalloc(sizeof(ati_page_map), GFP_KERNEL);
                 if (entry == NULL) {
                         while (i>0) {
                                 kfree (tables[i-1]);
@@ -134,7 +134,6 @@ static int ati_create_gatt_pages(int nr_tables)
                         retval = -ENOMEM;
                         break;
                 }
-                memset(entry, 0, sizeof(ati_page_map));
                 tables[i] = entry;
                 retval = ati_create_page_map(entry);
                 if (retval != 0) break;
diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c
index 82b43c541c8d..80ee17a8fc23 100644
--- a/drivers/char/agp/backend.c
+++ b/drivers/char/agp/backend.c
@@ -97,7 +97,7 @@ void agp_backend_release(struct agp_bridge_data *bridge)
 EXPORT_SYMBOL(agp_backend_release);
 
 
-static struct { int mem, agp; } maxes_table[] = {
+static const struct { int mem, agp; } maxes_table[] = {
         {0, 0},
         {32, 4},
         {64, 28},
@@ -147,6 +147,7 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)
                         printk(KERN_ERR PFX "unable to get memory for scratch page.\n");
                         return -ENOMEM;
                 }
+                flush_agp_mappings();
 
                 bridge->scratch_page_real = virt_to_gart(addr);
                 bridge->scratch_page =
@@ -187,9 +188,11 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)
         return 0;
 
 err_out:
-        if (bridge->driver->needs_scratch_page)
+        if (bridge->driver->needs_scratch_page) {
                 bridge->driver->agp_destroy_page(
                                 gart_to_virt(bridge->scratch_page_real));
+                flush_agp_mappings();
+        }
         if (got_gatt)
                 bridge->driver->free_gatt_table(bridge);
         if (got_keylist) {
@@ -211,9 +214,11 @@ static void agp_backend_cleanup(struct agp_bridge_data *bridge)
         bridge->key_list = NULL;
 
         if (bridge->driver->agp_destroy_page &&
-            bridge->driver->needs_scratch_page)
+            bridge->driver->needs_scratch_page) {
                 bridge->driver->agp_destroy_page(
                                 gart_to_virt(bridge->scratch_page_real));
+                flush_agp_mappings();
+        }
 }
 
 /* When we remove the global variable agp_bridge from all drivers
@@ -222,12 +227,12 @@ static void agp_backend_cleanup(struct agp_bridge_data *bridge)
 
 struct agp_bridge_data *agp_alloc_bridge(void)
 {
-        struct agp_bridge_data *bridge = kmalloc(sizeof(*bridge), GFP_KERNEL);
-
+        struct agp_bridge_data *bridge;
+        
+        bridge = kzalloc(sizeof(*bridge), GFP_KERNEL);
         if (!bridge)
                 return NULL;
 
-        memset(bridge, 0, sizeof(*bridge));
         atomic_set(&bridge->agp_in_use, 0);
         atomic_set(&bridge->current_memory_agp, 0);
 
diff --git a/drivers/char/agp/efficeon-agp.c b/drivers/char/agp/efficeon-agp.c
index ac19fdcd21c1..e7aea77a60f9 100644
--- a/drivers/char/agp/efficeon-agp.c
+++ b/drivers/char/agp/efficeon-agp.c
@@ -219,7 +219,7 @@ static int efficeon_create_gatt_table(struct agp_bridge_data *bridge)
 
                 efficeon_private.l1_table[index] = page;
 
-                value = virt_to_gart(page) | pati | present | index;
+                value = virt_to_gart((unsigned long *)page) | pati | present | index;
 
                 pci_write_config_dword(agp_bridge->dev,
                         EFFICEON_ATTPAGE, value);
diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
index 3dfb6648547b..17f520c9d471 100644
--- a/drivers/char/agp/frontend.c
+++ b/drivers/char/agp/frontend.c
@@ -189,13 +189,12 @@ static int agp_create_segment(struct agp_client *client, struct agp_region *regi
         struct agp_segment *user_seg;
         size_t i;
 
-        seg = kmalloc((sizeof(struct agp_segment_priv) * region->seg_count), GFP_KERNEL);
+        seg = kzalloc((sizeof(struct agp_segment_priv) * region->seg_count), GFP_KERNEL);
         if (seg == NULL) {
                 kfree(region->seg_list);
                 region->seg_list = NULL;
                 return -ENOMEM;
         }
-        memset(seg, 0, (sizeof(struct agp_segment_priv) * region->seg_count));
         user_seg = region->seg_list;
 
         for (i = 0; i < region->seg_count; i++) {
@@ -332,14 +331,11 @@ static struct agp_controller *agp_create_controller(pid_t id)
 {
         struct agp_controller *controller;
 
-        controller = kmalloc(sizeof(struct agp_controller), GFP_KERNEL);
-
+        controller = kzalloc(sizeof(struct agp_controller), GFP_KERNEL);
         if (controller == NULL)
                 return NULL;
 
-        memset(controller, 0, sizeof(struct agp_controller));
         controller->pid = id;
-
         return controller;
 }
 
@@ -540,12 +536,10 @@ static struct agp_client *agp_create_client(pid_t id)
 {
         struct agp_client *new_client;
 
-        new_client = kmalloc(sizeof(struct agp_client), GFP_KERNEL);
-
+        new_client = kzalloc(sizeof(struct agp_client), GFP_KERNEL);
         if (new_client == NULL)
                 return NULL;
 
-        memset(new_client, 0, sizeof(struct agp_client));
         new_client->pid = id;
         agp_insert_client(new_client);
         return new_client;
@@ -709,11 +703,10 @@ static int agp_open(struct inode *inode, struct file *file)
         if (minor != AGPGART_MINOR)
                 goto err_out;
 
-        priv = kmalloc(sizeof(struct agp_file_private), GFP_KERNEL);
+        priv = kzalloc(sizeof(struct agp_file_private), GFP_KERNEL);
         if (priv == NULL)
                 goto err_out_nomem;
 
-        memset(priv, 0, sizeof(struct agp_file_private));
         set_bit(AGP_FF_ALLOW_CLIENT, &priv->access_flags);
         priv->my_pid = current->pid;
 
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index ac9da0ca36b7..5567ce8d72b0 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -57,7 +57,8 @@ int map_page_into_agp(struct page *page)
 {
         int i;
         i = change_page_attr(page, 1, PAGE_KERNEL_NOCACHE);
-        global_flush_tlb();
+        /* Caller's responsibility to call global_flush_tlb() for
+         * performance reasons */
         return i;
 }
 EXPORT_SYMBOL_GPL(map_page_into_agp);
@@ -66,7 +67,8 @@ int unmap_page_from_agp(struct page *page)
 {
         int i;
         i = change_page_attr(page, 1, PAGE_KERNEL);
-        global_flush_tlb();
+        /* Caller's responsibility to call global_flush_tlb() for
+         * performance reasons */
         return i;
 }
 EXPORT_SYMBOL_GPL(unmap_page_from_agp);
@@ -105,12 +107,10 @@ struct agp_memory *agp_create_memory(int scratch_pages)
 {
         struct agp_memory *new;
 
-        new = kmalloc(sizeof(struct agp_memory), GFP_KERNEL);
-
+        new = kzalloc(sizeof(struct agp_memory), GFP_KERNEL);
         if (new == NULL)
                 return NULL;
 
-        memset(new, 0, sizeof(struct agp_memory));
         new->key = agp_get_key();
 
         if (new->key < 0) {
@@ -155,6 +155,7 @@ void agp_free_memory(struct agp_memory *curr)
                 for (i = 0; i < curr->page_count; i++) {
                         curr->bridge->driver->agp_destroy_page(gart_to_virt(curr->memory[i]));
                 }
+                flush_agp_mappings();
         }
         agp_free_key(curr->key);
         vfree(curr->memory);
@@ -212,7 +213,7 @@ struct agp_memory *agp_allocate_memory(struct agp_bridge_data *bridge,
                 new->memory[i] = virt_to_gart(addr);
                 new->page_count++;
         }
-       new->bridge = bridge;
+        new->bridge = bridge;
 
         flush_agp_mappings();
 
@@ -414,7 +415,8 @@ static void agp_v2_parse_one(u32 *requested_mode, u32 *bridge_agpstat, u32 *vga_
         u32 tmp;
 
         if (*requested_mode & AGP2_RESERVED_MASK) {
-                printk(KERN_INFO PFX "reserved bits set in mode 0x%x. Fixed.\n", *requested_mode);
+                printk(KERN_INFO PFX "reserved bits set (%x) in mode 0x%x. Fixed.\n",
+                        *requested_mode & AGP2_RESERVED_MASK, *requested_mode);
                 *requested_mode &= ~AGP2_RESERVED_MASK;
         }
 
@@ -492,7 +494,8 @@ static void agp_v3_parse_one(u32 *requested_mode, u32 *bridge_agpstat, u32 *vga_
         u32 tmp;
 
         if (*requested_mode & AGP3_RESERVED_MASK) {
-                printk(KERN_INFO PFX "reserved bits set in mode 0x%x. Fixed.\n", *requested_mode);
+                printk(KERN_INFO PFX "reserved bits set (%x) in mode 0x%x. Fixed.\n",
+                        *requested_mode & AGP3_RESERVED_MASK, *requested_mode);
                 *requested_mode &= ~AGP3_RESERVED_MASK;
         }
 
diff --git a/drivers/char/agp/i460-agp.c b/drivers/char/agp/i460-agp.c
index 94943298c03e..8ee19a4a6bce 100644
--- a/drivers/char/agp/i460-agp.c
+++ b/drivers/char/agp/i460-agp.c
@@ -10,6 +10,8 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include <linux/agp_backend.h>
 
 #include "agp.h"
@@ -109,8 +111,10 @@ static int i460_fetch_size (void)
 
         if (i460.io_page_shift != I460_IO_PAGE_SHIFT) {
                 printk(KERN_ERR PFX
-                       "I/O (GART) page-size %ZuKB doesn't match expected size %ZuKB\n",
-                       1UL << (i460.io_page_shift - 10), 1UL << (I460_IO_PAGE_SHIFT));
+                        "I/O (GART) page-size %luKB doesn't match expected "
+                                "size %luKB\n",
+                        1UL << (i460.io_page_shift - 10),
+                        1UL << (I460_IO_PAGE_SHIFT));
                 return 0;
         }
 
@@ -225,10 +229,9 @@ static int i460_configure (void)
          */
         if (I460_IO_PAGE_SHIFT > PAGE_SHIFT) {
                 size = current_size->num_entries * sizeof(i460.lp_desc[0]);
-                i460.lp_desc = kmalloc(size, GFP_KERNEL);
+                i460.lp_desc = kzalloc(size, GFP_KERNEL);
                 if (!i460.lp_desc)
                         return -ENOMEM;
-                memset(i460.lp_desc, 0, size);
         }
         return 0;
 }
@@ -364,13 +367,12 @@ static int i460_alloc_large_page (struct lp_desc *lp)
         }
 
         map_size = ((I460_KPAGES_PER_IOPAGE + BITS_PER_LONG - 1) & -BITS_PER_LONG)/8;
-        lp->alloced_map = kmalloc(map_size, GFP_KERNEL);
+        lp->alloced_map = kzalloc(map_size, GFP_KERNEL);
         if (!lp->alloced_map) {
                 free_pages((unsigned long) lpage, order);
                 printk(KERN_ERR PFX "Out of memory, we're in trouble...\n");
                 return -ENOMEM;
         }
-        memset(lp->alloced_map, 0, map_size);
 
         lp->paddr = virt_to_gart(lpage);
         lp->refcount = 0;
@@ -514,9 +516,10 @@ static void *i460_alloc_page (struct agp_bridge_data *bridge)
 {
         void *page;
 
-        if (I460_IO_PAGE_SHIFT <= PAGE_SHIFT)
+        if (I460_IO_PAGE_SHIFT <= PAGE_SHIFT) {
                 page = agp_generic_alloc_page(agp_bridge);
-        else
+                global_flush_tlb();
+        } else
                 /* Returning NULL would cause problems */
                 /* AK: really dubious code. */
                 page = (void *)~0UL;
@@ -525,8 +528,10 @@ static void *i460_alloc_page (struct agp_bridge_data *bridge)
 
 static void i460_destroy_page (void *page)
 {
-        if (I460_IO_PAGE_SHIFT <= PAGE_SHIFT)
+        if (I460_IO_PAGE_SHIFT <= PAGE_SHIFT) {
                 agp_generic_destroy_page(page);
+                global_flush_tlb();
+        }
 }
 
 #endif /* I460_LARGE_IO_PAGES */
@@ -536,7 +541,7 @@ static unsigned long i460_mask_memory (struct agp_bridge_data *bridge,
 {
         /* Make sure the returned address is a valid GATT entry */
         return bridge->driver->masks[0].mask
-                | (((addr & ~((1 << I460_IO_PAGE_SHIFT) - 1)) & 0xffffff000) >> 12);
+                | (((addr & ~((1 << I460_IO_PAGE_SHIFT) - 1)) & 0xfffff000) >> 12);
 }
 
 struct agp_bridge_driver intel_i460_driver = {
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 1f7d415f432c..e7bed5047dcc 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -270,6 +270,7 @@ static struct agp_memory *alloc_agpphysmem_i8xx(size_t pg_count, int type)
 
         switch (pg_count) {
         case 1: addr = agp_bridge->driver->agp_alloc_page(agp_bridge);
+                global_flush_tlb();
                 break;
         case 4:
                 /* kludge to get 4 physical pages for ARGB cursor */
@@ -330,9 +331,11 @@ static void intel_i810_free_by_type(struct agp_memory *curr)
         if(curr->type == AGP_PHYS_MEMORY) {
                 if (curr->page_count == 4)
                         i8xx_destroy_pages(gart_to_virt(curr->memory[0]));
-                else
+                else {
                         agp_bridge->driver->agp_destroy_page(
                                  gart_to_virt(curr->memory[0]));
+                        global_flush_tlb();
+                }
                 vfree(curr->memory);
         }
         kfree(curr);
diff --git a/drivers/char/agp/isoch.c b/drivers/char/agp/isoch.c
index c9ac731504f2..40083241804e 100644
--- a/drivers/char/agp/isoch.c
+++ b/drivers/char/agp/isoch.c
@@ -6,6 +6,7 @@
 #include <linux/pci.h>
 #include <linux/agp_backend.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 
 #include "agp.h"
 
diff --git a/drivers/char/agp/sgi-agp.c b/drivers/char/agp/sgi-agp.c
index d3aa159c9dec..4df7734b51c2 100644
--- a/drivers/char/agp/sgi-agp.c
+++ b/drivers/char/agp/sgi-agp.c
@@ -17,6 +17,7 @@
 #include <linux/init.h>
 #include <linux/agp_backend.h>
 #include <asm/sn/addrs.h>
+#include <asm/sn/io.h>
 #include <asm/sn/pcidev.h>
 #include <asm/sn/pcibus_provider_defs.h>
 #include <asm/sn/tioca_provider.h>
@@ -288,6 +289,8 @@ static int __devinit agp_sgi_init(void)
         j = 0;
         list_for_each_entry(info, &tioca_list, ca_list) {
                 struct list_head *tmp;
+                if (list_empty(info->ca_devices))
+                        continue;
                 list_for_each(tmp, info->ca_devices) {
                         u8 cap_ptr;
                         pdev = pci_dev_b(tmp);
diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c
index a9fb12c20eb7..3f8f7fa6b0ff 100644
--- a/drivers/char/agp/sworks-agp.c
+++ b/drivers/char/agp/sworks-agp.c
@@ -5,6 +5,8 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include <linux/agp_backend.h>
 #include "agp.h"
 
@@ -100,19 +102,17 @@ static int serverworks_create_gatt_pages(int nr_tables)
         int retval = 0;
         int i;
 
-        tables = kmalloc((nr_tables + 1) * sizeof(struct serverworks_page_map *), 
+        tables = kzalloc((nr_tables + 1) * sizeof(struct serverworks_page_map *), 
                          GFP_KERNEL);
-        if (tables == NULL) {
+        if (tables == NULL)
                 return -ENOMEM;
-        }
-        memset(tables, 0, sizeof(struct serverworks_page_map *) * (nr_tables + 1));
+
         for (i = 0; i < nr_tables; i++) {
-                entry = kmalloc(sizeof(struct serverworks_page_map), GFP_KERNEL);
+                entry = kzalloc(sizeof(struct serverworks_page_map), GFP_KERNEL);
                 if (entry == NULL) {
                         retval = -ENOMEM;
                         break;
                 }
-                memset(entry, 0, sizeof(struct serverworks_page_map));
                 tables[i] = entry;
                 retval = serverworks_create_page_map(entry);
                 if (retval != 0) break;
@@ -242,13 +242,27 @@ static int serverworks_fetch_size(void)
  */
 static void serverworks_tlbflush(struct agp_memory *temp)
 {
+        unsigned long timeout;
+
         writeb(1, serverworks_private.registers+SVWRKS_POSTFLUSH);
-        while (readb(serverworks_private.registers+SVWRKS_POSTFLUSH) == 1)
+        timeout = jiffies + 3*HZ;
+        while (readb(serverworks_private.registers+SVWRKS_POSTFLUSH) == 1) {
                 cpu_relax();
+                if (time_after(jiffies, timeout)) {
+                        printk(KERN_ERR PFX "TLB post flush took more than 3 seconds\n");
+                        break;
+                }
+        }
 
         writel(1, serverworks_private.registers+SVWRKS_DIRFLUSH);
-        while(readl(serverworks_private.registers+SVWRKS_DIRFLUSH) == 1)
+        timeout = jiffies + 3*HZ;
+        while (readl(serverworks_private.registers+SVWRKS_DIRFLUSH) == 1) {
                 cpu_relax();
+                if (time_after(jiffies, timeout)) {
+                        printk(KERN_ERR PFX "TLB Dir flush took more than 3 seconds\n");
+                        break;
+                }
+        }
 }
 
 static int serverworks_configure(void)
diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c
index c8255312b8c1..50947e38501a 100644
--- a/drivers/char/agp/uninorth-agp.c
+++ b/drivers/char/agp/uninorth-agp.c
@@ -557,6 +557,10 @@ static struct agp_device_ids uninorth_agp_device_ids[] __devinitdata = {
                 .device_id      = PCI_DEVICE_ID_APPLE_U3H_AGP,
                 .chipset_name   = "U3H",
         },
+        {
+                .device_id      = PCI_DEVICE_ID_APPLE_IPID2_AGP,
+                .chipset_name   = "UniNorth/Intrepid2",
+        },
 };
 
 static int __devinit agp_uninorth_probe(struct pci_dev *pdev,
diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c
index c847df575cf5..97b0a890ba7f 100644
--- a/drivers/char/agp/via-agp.c
+++ b/drivers/char/agp/via-agp.c
@@ -371,6 +371,11 @@ static struct agp_device_ids via_agp_device_ids[] __devinitdata =
                 .device_id      = PCI_DEVICE_ID_VIA_3296_0,
                 .chipset_name   = "P4M800",
         },
+        /* P4M800CE */
+        {
+                .device_id      = PCI_DEVICE_ID_VIA_P4M800CE,
+                .chipset_name   = "P4M800CE",
+        },
 
         { }, /* dummy final entry, always present */
 };
@@ -511,6 +516,7 @@ static struct pci_device_id agp_via_pci_table[] = {
         ID(PCI_DEVICE_ID_VIA_3269_0),
         ID(PCI_DEVICE_ID_VIA_83_87XX_1),
         ID(PCI_DEVICE_ID_VIA_3296_0),
+        ID(PCI_DEVICE_ID_VIA_P4M800CE),
         { }
 };