Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: (890 commits)
  x86: fix nodemap_size according to nodeid bits
  x86: fix overlap between pagetable with bss section
  x86: add PCI IDs to k8topology_64.c
  x86: fix early_ioremap pagetable ops
  x86: use the same pgd_list for PAE and 64-bit
  x86: defer cr3 reload when doing pud_clear()
  x86: early boot debugging via FireWire (ohci1394_dma=early)
  x86: don't special-case pmd allocations as much
  x86: shrink some ifdefs in fault.c
  x86: ignore spurious faults
  x86: remove nx_enabled from fault.c
  x86: unify fault_32|64.c
  x86: unify fault_32|64.c with ifdefs
  x86: unify fault_32|64.c by ifdef'd function bodies
  x86: arch/x86/mm/init_32.c printk fixes
  x86: arch/x86/mm/init_32.c cleanup
  x86: arch/x86/mm/init_64.c printk fixes
  x86: unify ioremap
  x86: fixes some bugs about EFI memory map handling
  x86: use reboot_type on EFI 32
  ...

1 files changed, 3 insertions, 8 deletions

diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 03eac1eb8e0f..189efb6ef970 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -210,13 +210,11 @@ static void *i8xx_alloc_pages(void)
         if (page == NULL)
                 return NULL;
 
-        if (change_page_attr(page, 4, PAGE_KERNEL_NOCACHE) < 0) {
-                change_page_attr(page, 4, PAGE_KERNEL);
-                global_flush_tlb();
+        if (set_pages_uc(page, 4) < 0) {
+                set_pages_wb(page, 4);
                 __free_pages(page, 2);
                 return NULL;
         }
-        global_flush_tlb();
         get_page(page);
         atomic_inc(&agp_bridge->current_memory_agp);
         return page_address(page);
@@ -230,8 +228,7 @@ static void i8xx_destroy_pages(void *addr)
                 return;
 
         page = virt_to_page(addr);
-        change_page_attr(page, 4, PAGE_KERNEL);
-        global_flush_tlb();
+        set_pages_wb(page, 4);
         put_page(page);
         __free_pages(page, 2);
         atomic_dec(&agp_bridge->current_memory_agp);
@@ -341,7 +338,6 @@ 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 */
@@ -404,7 +400,6 @@ static void intel_i810_free_by_type(struct agp_memory *curr)
                 else {
                         agp_bridge->driver->agp_destroy_page(gart_to_virt(curr->memory[0]),
                                                              AGP_PAGE_DESTROY_UNMAP);
-                        global_flush_tlb();
                         agp_bridge->driver->agp_destroy_page(gart_to_virt(curr->memory[0]),
                                                              AGP_PAGE_DESTROY_FREE);
                 }