Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (151 commits)
  powerpc: Fix usage of 64-bit instruction in 32-bit altivec code
  MAINTAINERS: Add PowerPC patterns
  powerpc/pseries: Track previous CPPR values to correctly EOI interrupts
  powerpc/pseries: Correct pseries/dlpar.c build break without CONFIG_SMP
  powerpc: Make "intspec" pointers in irq_host->xlate() const
  powerpc/8xx: DTLB Miss cleanup
  powerpc/8xx: Remove DIRTY pte handling in DTLB Error.
  powerpc/8xx: Start using dcbX instructions in various copy routines
  powerpc/8xx: Restore _PAGE_WRITETHRU
  powerpc/8xx: Add missing Guarded setting in DTLB Error.
  powerpc/8xx: Fixup DAR from buggy dcbX instructions.
  powerpc/8xx: Tag DAR with 0x00f0 to catch buggy instructions.
  powerpc/8xx: Update TLB asm so it behaves as linux mm expects.
  powerpc/8xx: Invalidate non present TLBs
  powerpc/pseries: Serialize cpu hotplug operations during deactivate Vs deallocate
  pseries/pseries: Add code to online/offline CPUs of a DLPAR node
  powerpc: stop_this_cpu: remove the cpu from the online map.
  powerpc/pseries: Add kernel based CPU DLPAR handling
  sysfs/cpu: Add probe/release files
  powerpc/pseries: Kernel DLPAR Infrastructure
  ...

1 files changed, 25 insertions, 52 deletions

diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c
index 703959eba45a..d89da4ac061f 100644
--- a/drivers/char/agp/uninorth-agp.c
+++ b/drivers/char/agp/uninorth-agp.c
@@ -144,16 +144,13 @@ static int uninorth_configure(void)
         return 0;
 }
 
-static int uninorth_insert_memory(struct agp_memory *mem, off_t pg_start,
-                                int type)
+static int uninorth_insert_memory(struct agp_memory *mem, off_t pg_start, int type)
 {
-        int i, j, num_entries;
+        int i, num_entries;
         void *temp;
+        u32 *gp;
         int mask_type;
 
-        temp = agp_bridge->current_size;
-        num_entries = A_SIZE_32(temp)->num_entries;
-
         if (type != mem->type)
                 return -EINVAL;
 
@@ -163,49 +160,12 @@ static int uninorth_insert_memory(struct agp_memory *mem, off_t pg_start,
                 return -EINVAL;
         }
 
-        if ((pg_start + mem->page_count) > num_entries)
-                return -EINVAL;
-
-        j = pg_start;
-
-        while (j < (pg_start + mem->page_count)) {
-                if (agp_bridge->gatt_table[j])
-                        return -EBUSY;
-                j++;
-        }
-
-        for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {
-                agp_bridge->gatt_table[j] =
-                        cpu_to_le32((page_to_phys(mem->pages[i]) & 0xFFFFF000UL) | 0x1UL);
-                flush_dcache_range((unsigned long)__va(page_to_phys(mem->pages[i])),
-                                   (unsigned long)__va(page_to_phys(mem->pages[i]))+0x1000);
-        }
-        (void)in_le32((volatile u32*)&agp_bridge->gatt_table[pg_start]);
-        mb();
-
-        uninorth_tlbflush(mem);
-        return 0;
-}
-
-static int u3_insert_memory(struct agp_memory *mem, off_t pg_start, int type)
-{
-        int i, num_entries;
-        void *temp;
-        u32 *gp;
-        int mask_type;
+        if (mem->page_count == 0)
+                return 0;
 
         temp = agp_bridge->current_size;
         num_entries = A_SIZE_32(temp)->num_entries;
 
-        if (type != mem->type)
-                return -EINVAL;
-
-        mask_type = agp_bridge->driver->agp_type_to_mask_type(agp_bridge, type);
-        if (mask_type != 0) {
-                /* We know nothing of memory types */
-                return -EINVAL;
-        }
-
         if ((pg_start + mem->page_count) > num_entries)
                 return -EINVAL;
 
@@ -213,14 +173,18 @@ static int u3_insert_memory(struct agp_memory *mem, off_t pg_start, int type)
         for (i = 0; i < mem->page_count; ++i) {
                 if (gp[i]) {
                         dev_info(&agp_bridge->dev->dev,
-                                 "u3_insert_memory: entry 0x%x occupied (%x)\n",
+                                 "uninorth_insert_memory: entry 0x%x occupied (%x)\n",
                                  i, gp[i]);
                         return -EBUSY;
                 }
         }
 
         for (i = 0; i < mem->page_count; i++) {
-                gp[i] = (page_to_phys(mem->pages[i]) >> PAGE_SHIFT) | 0x80000000UL;
+                if (is_u3)
+                        gp[i] = (page_to_phys(mem->pages[i]) >> PAGE_SHIFT) | 0x80000000UL;
+                else
+                        gp[i] = cpu_to_le32((page_to_phys(mem->pages[i]) & 0xFFFFF000UL) |
+                                            0x1UL);
                 flush_dcache_range((unsigned long)__va(page_to_phys(mem->pages[i])),
                                    (unsigned long)__va(page_to_phys(mem->pages[i]))+0x1000);
         }
@@ -230,14 +194,23 @@ static int u3_insert_memory(struct agp_memory *mem, off_t pg_start, int type)
         return 0;
 }
 
-int u3_remove_memory(struct agp_memory *mem, off_t pg_start, int type)
+int uninorth_remove_memory(struct agp_memory *mem, off_t pg_start, int type)
 {
         size_t i;
         u32 *gp;
+        int mask_type;
+
+        if (type != mem->type)
+                return -EINVAL;
 
-        if (type != 0 || mem->type != 0)
+        mask_type = agp_bridge->driver->agp_type_to_mask_type(agp_bridge, type);
+        if (mask_type != 0) {
                 /* We know nothing of memory types */
                 return -EINVAL;
+        }
+
+        if (mem->page_count == 0)
+                return 0;
 
         gp = (u32 *) &agp_bridge->gatt_table[pg_start];
         for (i = 0; i < mem->page_count; ++i)
@@ -536,7 +509,7 @@ const struct agp_bridge_driver uninorth_agp_driver = {
         .create_gatt_table      = uninorth_create_gatt_table,
         .free_gatt_table        = uninorth_free_gatt_table,
         .insert_memory          = uninorth_insert_memory,
-        .remove_memory          = agp_generic_remove_memory,
+        .remove_memory          = uninorth_remove_memory,
         .alloc_by_type          = agp_generic_alloc_by_type,
         .free_by_type           = agp_generic_free_by_type,
         .agp_alloc_page         = agp_generic_alloc_page,
@@ -562,8 +535,8 @@ const struct agp_bridge_driver u3_agp_driver = {
         .agp_enable             = uninorth_agp_enable,
         .create_gatt_table      = uninorth_create_gatt_table,
         .free_gatt_table        = uninorth_free_gatt_table,
-        .insert_memory          = u3_insert_memory,
-        .remove_memory          = u3_remove_memory,
+        .insert_memory          = uninorth_insert_memory,
+        .remove_memory          = uninorth_remove_memory,
         .alloc_by_type          = agp_generic_alloc_by_type,
         .free_by_type           = agp_generic_free_by_type,
         .agp_alloc_page         = agp_generic_alloc_page,