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: (78 commits)
  x86: fix RTC lockdep warning: potential hardirq recursion
  x86: cpa, micro-optimization
  x86: cpa, clean up code flow
  x86: cpa, eliminate CPA_ enum
  x86: cpa, cleanups
  x86: implement gbpages support in change_page_attr()
  x86: support gbpages in pagetable dump
  x86: add gbpages support to lookup_address
  x86: add pgtable accessor functions for gbpages
  x86: add PUD_PAGE_SIZE
  x86: add feature macros for the gbpages cpuid bit
  x86: switch direct mapping setup over to set_pte
  x86: fix page-present check in cpa_flush_range
  x86: remove cpa warning
  x86: remove now unused clear_kernel_mapping
  x86: switch pci-gart over to using set_memory_np() instead of clear_kernel_mapping()
  x86: cpa selftest, skip non present entries
  x86: CPA fix pagetable split
  x86: rename LARGE_PAGE_SIZE to PMD_PAGE_SIZE
  x86: cpa, fix lookup_address
  ...

1 files changed, 2 insertions, 47 deletions

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index eabcaed76c2..3a98d6f724a 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -273,7 +273,6 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end)
         int i = pmd_index(address);
 
         for (; i < PTRS_PER_PMD; i++, address += PMD_SIZE) {
-                unsigned long entry;
                 pmd_t *pmd = pmd_page + pmd_index(address);
 
                 if (address >= end) {
@@ -287,9 +286,8 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end)
                 if (pmd_val(*pmd))
                         continue;
 
-                entry = __PAGE_KERNEL_LARGE|_PAGE_GLOBAL|address;
-                entry &= __supported_pte_mask;
-                set_pmd(pmd, __pmd(entry));
+                set_pte((pte_t *)pmd,
+                        pfn_pte(address >> PAGE_SHIFT, PAGE_KERNEL_LARGE));
         }
 }
 
@@ -435,49 +433,6 @@ void __init paging_init(void)
 #endif
 
 /*
- * Unmap a kernel mapping if it exists. This is useful to avoid
- * prefetches from the CPU leading to inconsistent cache lines.
- * address and size must be aligned to 2MB boundaries.
- * Does nothing when the mapping doesn't exist.
- */
-void __init clear_kernel_mapping(unsigned long address, unsigned long size)
-{
-        unsigned long end = address + size;
-
-        BUG_ON(address & ~LARGE_PAGE_MASK);
-        BUG_ON(size & ~LARGE_PAGE_MASK);
-
-        for (; address < end; address += LARGE_PAGE_SIZE) {
-                pgd_t *pgd = pgd_offset_k(address);
-                pud_t *pud;
-                pmd_t *pmd;
-
-                if (pgd_none(*pgd))
-                        continue;
-
-                pud = pud_offset(pgd, address);
-                if (pud_none(*pud))
-                        continue;
-
-                pmd = pmd_offset(pud, address);
-                if (!pmd || pmd_none(*pmd))
-                        continue;
-
-                if (!(pmd_val(*pmd) & _PAGE_PSE)) {
-                        /*
-                         * Could handle this, but it should not happen
-                         * currently:
-                         */
-                        printk(KERN_ERR "clear_kernel_mapping: "
-                                "mapping has been split. will leak memory\n");
-                        pmd_ERROR(*pmd);
-                }
-                set_pmd(pmd, __pmd(0));
-        }
-        __flush_tlb_all();
-}
-
-/*
  * Memory hotplug specific functions
  */
 void online_page(struct page *page)