Merge branch 'linus' into cpumask-for-linus

Conflicts:
	arch/x86/kernel/cpu/common.c

9 files changed, 152 insertions, 75 deletions

diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
index d11745334a67..522db5e3d0bf 100644
--- a/arch/x86/mm/highmem_32.c
+++ b/arch/x86/mm/highmem_32.c
@@ -121,22 +121,13 @@ void kunmap_atomic(void *kvaddr, enum km_type type)
         pagefault_enable();
 }
 
-/* This is the same as kmap_atomic() but can map memory that doesn't
+/*
+ * This is the same as kmap_atomic() but can map memory that doesn't
  * have a struct page associated with it.
  */
 void *kmap_atomic_pfn(unsigned long pfn, enum km_type type)
 {
-        enum fixed_addresses idx;
-        unsigned long vaddr;
-
-        pagefault_disable();
-
-        idx = type + KM_TYPE_NR*smp_processor_id();
-        vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
-        set_pte(kmap_pte-idx, pfn_pte(pfn, kmap_prot));
-        arch_flush_lazy_mmu_mode();
-
-        return (void*) vaddr;
+        return kmap_atomic_prot_pfn(pfn, type, kmap_prot);
 }
 EXPORT_SYMBOL_GPL(kmap_atomic_pfn); /* temporarily in use by i915 GEM until vmap */
 
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 15219e0d1243..fd3da1dda1c9 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -94,9 +94,9 @@ struct map_range {
 #define NR_RANGE_MR 5
 #endif
 
-static int save_mr(struct map_range *mr, int nr_range,
-                   unsigned long start_pfn, unsigned long end_pfn,
-                   unsigned long page_size_mask)
+static int __meminit save_mr(struct map_range *mr, int nr_range,
+                             unsigned long start_pfn, unsigned long end_pfn,
+                             unsigned long page_size_mask)
 {
         if (start_pfn < end_pfn) {
                 if (nr_range >= NR_RANGE_MR)
diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
index 04102d42ff42..699c9b2895ae 100644
--- a/arch/x86/mm/iomap_32.c
+++ b/arch/x86/mm/iomap_32.c
@@ -31,16 +31,27 @@ int is_io_mapping_possible(resource_size_t base, unsigned long size)
 }
 EXPORT_SYMBOL_GPL(is_io_mapping_possible);
 
-/* Map 'pfn' using fixed map 'type' and protections 'prot'
- */
-void *
-iomap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot)
+void *kmap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot)
 {
         enum fixed_addresses idx;
         unsigned long vaddr;
 
         pagefault_disable();
 
+        idx = type + KM_TYPE_NR * smp_processor_id();
+        vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
+        set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
+        arch_flush_lazy_mmu_mode();
+
+        return (void *)vaddr;
+}
+
+/*
+ * Map 'pfn' using fixed map 'type' and protections 'prot'
+ */
+void *
+iomap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot)
+{
         /*
          * For non-PAT systems, promote PAGE_KERNEL_WC to PAGE_KERNEL_UC_MINUS.
          * PAGE_KERNEL_WC maps to PWT, which translates to uncached if the
@@ -50,12 +61,7 @@ iomap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot)
         if (!pat_enabled && pgprot_val(prot) == pgprot_val(PAGE_KERNEL_WC))
                 prot = PAGE_KERNEL_UC_MINUS;
 
-        idx = type + KM_TYPE_NR*smp_processor_id();
-        vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
-        set_pte(kmap_pte-idx, pfn_pte(pfn, prot));
-        arch_flush_lazy_mmu_mode();
-
-        return (void*) vaddr;
+        return kmap_atomic_prot_pfn(pfn, type, prot);
 }
 EXPORT_SYMBOL_GPL(iomap_atomic_prot_pfn);
 
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index aca924a30ee6..0dfa09d69e80 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -22,13 +22,17 @@
 #include <asm/pgalloc.h>
 #include <asm/pat.h>
 
-#ifdef CONFIG_X86_64
-
-static inline int phys_addr_valid(unsigned long addr)
+static inline int phys_addr_valid(resource_size_t addr)
 {
-        return addr < (1UL << boot_cpu_data.x86_phys_bits);
+#ifdef CONFIG_PHYS_ADDR_T_64BIT
+        return !(addr >> boot_cpu_data.x86_phys_bits);
+#else
+        return 1;
+#endif
 }
 
+#ifdef CONFIG_X86_64
+
 unsigned long __phys_addr(unsigned long x)
 {
         if (x >= __START_KERNEL_map) {
@@ -65,11 +69,6 @@ EXPORT_SYMBOL(__virt_addr_valid);
 
 #else
 
-static inline int phys_addr_valid(unsigned long addr)
-{
-        return 1;
-}
-
 #ifdef CONFIG_DEBUG_VIRTUAL
 unsigned long __phys_addr(unsigned long x)
 {
@@ -517,7 +516,7 @@ void __init early_ioremap_init(void)
                 printk(KERN_INFO "early_ioremap_init()\n");
 
         for (i = 0; i < FIX_BTMAPS_SLOTS; i++)
-                slot_virt[i] = fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i);
+                slot_virt[i] = __fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i);
 
         pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
         memset(bm_pte, 0, sizeof(bm_pte));
diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c
index 6a518dd08a36..4f115e00486b 100644
--- a/arch/x86/mm/kmmio.c
+++ b/arch/x86/mm/kmmio.c
@@ -310,7 +310,7 @@ static int post_kmmio_handler(unsigned long condition, struct pt_regs *regs)
         struct kmmio_context *ctx = &get_cpu_var(kmmio_ctx);
 
         if (!ctx->active) {
-                pr_warning("kmmio: spurious debug trap on CPU %d.\n",
+                pr_debug("kmmio: spurious debug trap on CPU %d.\n",
                                                         smp_processor_id());
                 goto out;
         }
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 9c4294986af7..d71e1b636ce6 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -16,6 +16,7 @@
 #include <asm/processor.h>
 #include <asm/tlbflush.h>
 #include <asm/sections.h>
+#include <asm/setup.h>
 #include <asm/uaccess.h>
 #include <asm/pgalloc.h>
 #include <asm/proto.h>
@@ -33,6 +34,7 @@ struct cpa_data {
         unsigned long   pfn;
         unsigned        force_split : 1;
         int             curpage;
+        struct page     **pages;
 };
 
 /*
@@ -45,6 +47,7 @@ static DEFINE_SPINLOCK(cpa_lock);
 
 #define CPA_FLUSHTLB 1
 #define CPA_ARRAY 2
+#define CPA_PAGES_ARRAY 4
 
 #ifdef CONFIG_PROC_FS
 static unsigned long direct_pages_count[PG_LEVEL_NUM];
@@ -95,7 +98,7 @@ static inline unsigned long highmap_start_pfn(void)
 
 static inline unsigned long highmap_end_pfn(void)
 {
-        return __pa(roundup((unsigned long)_end, PMD_SIZE)) >> PAGE_SHIFT;
+        return __pa(roundup(_brk_end, PMD_SIZE)) >> PAGE_SHIFT;
 }
 
 #endif
@@ -201,10 +204,10 @@ static void cpa_flush_range(unsigned long start, int numpages, int cache)
         }
 }
 
-static void cpa_flush_array(unsigned long *start, int numpages, int cache)
+static void cpa_flush_array(unsigned long *start, int numpages, int cache,
+                            int in_flags, struct page **pages)
 {
         unsigned int i, level;
-        unsigned long *addr;
 
         BUG_ON(irqs_disabled());
 
@@ -225,14 +228,22 @@ static void cpa_flush_array(unsigned long *start, int numpages, int cache)
          * will cause all other CPUs to flush the same
          * cachelines:
          */
-        for (i = 0, addr = start; i < numpages; i++, addr++) {
-                pte_t *pte = lookup_address(*addr, &level);
+        for (i = 0; i < numpages; i++) {
+                unsigned long addr;
+                pte_t *pte;
+
+                if (in_flags & CPA_PAGES_ARRAY)
+                        addr = (unsigned long)page_address(pages[i]);
+                else
+                        addr = start[i];
+
+                pte = lookup_address(addr, &level);
 
                 /*
                  * Only flush present addresses:
                  */
                 if (pte && (pte_val(*pte) & _PAGE_PRESENT))
-                        clflush_cache_range((void *) *addr, PAGE_SIZE);
+                        clflush_cache_range((void *)addr, PAGE_SIZE);
         }
 }
 
@@ -584,7 +595,9 @@ static int __change_page_attr(struct cpa_data *cpa, int primary)
         unsigned int level;
         pte_t *kpte, old_pte;
 
-        if (cpa->flags & CPA_ARRAY)
+        if (cpa->flags & CPA_PAGES_ARRAY)
+                address = (unsigned long)page_address(cpa->pages[cpa->curpage]);
+        else if (cpa->flags & CPA_ARRAY)
                 address = cpa->vaddr[cpa->curpage];
         else
                 address = *cpa->vaddr;
@@ -687,7 +700,9 @@ static int cpa_process_alias(struct cpa_data *cpa)
          * No need to redo, when the primary call touched the direct
          * mapping already:
          */
-        if (cpa->flags & CPA_ARRAY)
+        if (cpa->flags & CPA_PAGES_ARRAY)
+                vaddr = (unsigned long)page_address(cpa->pages[cpa->curpage]);
+        else if (cpa->flags & CPA_ARRAY)
                 vaddr = cpa->vaddr[cpa->curpage];
         else
                 vaddr = *cpa->vaddr;
@@ -698,7 +713,7 @@ static int cpa_process_alias(struct cpa_data *cpa)
                 alias_cpa = *cpa;
                 temp_cpa_vaddr = (unsigned long) __va(cpa->pfn << PAGE_SHIFT);
                 alias_cpa.vaddr = &temp_cpa_vaddr;
-                alias_cpa.flags &= ~CPA_ARRAY;
+                alias_cpa.flags &= ~(CPA_PAGES_ARRAY | CPA_ARRAY);
 
 
                 ret = __change_page_attr_set_clr(&alias_cpa, 0);
@@ -711,7 +726,7 @@ static int cpa_process_alias(struct cpa_data *cpa)
          * No need to redo, when the primary call touched the high
          * mapping already:
          */
-        if (within(vaddr, (unsigned long) _text, (unsigned long) _end))
+        if (within(vaddr, (unsigned long) _text, _brk_end))
                 return 0;
 
         /*
@@ -724,7 +739,7 @@ static int cpa_process_alias(struct cpa_data *cpa)
         alias_cpa = *cpa;
         temp_cpa_vaddr = (cpa->pfn << PAGE_SHIFT) + __START_KERNEL_map - phys_base;
         alias_cpa.vaddr = &temp_cpa_vaddr;
-        alias_cpa.flags &= ~CPA_ARRAY;
+        alias_cpa.flags &= ~(CPA_PAGES_ARRAY | CPA_ARRAY);
 
         /*
          * The high mapping range is imprecise, so ignore the return value.
@@ -745,7 +760,7 @@ static int __change_page_attr_set_clr(struct cpa_data *cpa, int checkalias)
                  */
                 cpa->numpages = numpages;
                 /* for array changes, we can't use large page */
-                if (cpa->flags & CPA_ARRAY)
+                if (cpa->flags & (CPA_ARRAY | CPA_PAGES_ARRAY))
                         cpa->numpages = 1;
 
                 if (!debug_pagealloc)
@@ -769,7 +784,7 @@ static int __change_page_attr_set_clr(struct cpa_data *cpa, int checkalias)
                  */
                 BUG_ON(cpa->numpages > numpages);
                 numpages -= cpa->numpages;
-                if (cpa->flags & CPA_ARRAY)
+                if (cpa->flags & (CPA_PAGES_ARRAY | CPA_ARRAY))
                         cpa->curpage++;
                 else
                         *cpa->vaddr += cpa->numpages * PAGE_SIZE;
@@ -786,7 +801,8 @@ static inline int cache_attr(pgprot_t attr)
 
 static int change_page_attr_set_clr(unsigned long *addr, int numpages,
                                     pgprot_t mask_set, pgprot_t mask_clr,
-                                    int force_split, int array)
+                                    int force_split, int in_flag,
+                                    struct page **pages)
 {
         struct cpa_data cpa;
         int ret, cache, checkalias;
@@ -801,15 +817,7 @@ static int change_page_attr_set_clr(unsigned long *addr, int numpages,
                 return 0;
 
         /* Ensure we are PAGE_SIZE aligned */
-        if (!array) {
-                if (*addr & ~PAGE_MASK) {
-                        *addr &= PAGE_MASK;
-                        /*
-                         * People should not be passing in unaligned addresses:
-                         */
-                        WARN_ON_ONCE(1);
-                }
-        } else {
+        if (in_flag & CPA_ARRAY) {
                 int i;
                 for (i = 0; i < numpages; i++) {
                         if (addr[i] & ~PAGE_MASK) {
@@ -817,6 +825,18 @@ static int change_page_attr_set_clr(unsigned long *addr, int numpages,
                                 WARN_ON_ONCE(1);
                         }
                 }
+        } else if (!(in_flag & CPA_PAGES_ARRAY)) {
+                /*
+                 * in_flag of CPA_PAGES_ARRAY implies it is aligned.
+                 * No need to cehck in that case
+                 */
+                if (*addr & ~PAGE_MASK) {
+                        *addr &= PAGE_MASK;
+                        /*
+                         * People should not be passing in unaligned addresses:
+                         */
+                        WARN_ON_ONCE(1);
+                }
         }
 
         /* Must avoid aliasing mappings in the highmem code */
@@ -832,6 +852,7 @@ static int change_page_attr_set_clr(unsigned long *addr, int numpages,
         arch_flush_lazy_mmu_mode();
 
         cpa.vaddr = addr;
+        cpa.pages = pages;
         cpa.numpages = numpages;
         cpa.mask_set = mask_set;
         cpa.mask_clr = mask_clr;
@@ -839,8 +860,8 @@ static int change_page_attr_set_clr(unsigned long *addr, int numpages,
         cpa.curpage = 0;
         cpa.force_split = force_split;
 
-        if (array)
-                cpa.flags |= CPA_ARRAY;
+        if (in_flag & (CPA_ARRAY | CPA_PAGES_ARRAY))
+                cpa.flags |= in_flag;
 
         /* No alias checking for _NX bit modifications */
         checkalias = (pgprot_val(mask_set) | pgprot_val(mask_clr)) != _PAGE_NX;
@@ -866,9 +887,10 @@ static int change_page_attr_set_clr(unsigned long *addr, int numpages,
          * wbindv):
          */
         if (!ret && cpu_has_clflush) {
-                if (cpa.flags & CPA_ARRAY)
-                        cpa_flush_array(addr, numpages, cache);
-                else
+                if (cpa.flags & (CPA_PAGES_ARRAY | CPA_ARRAY)) {
+                        cpa_flush_array(addr, numpages, cache,
+                                        cpa.flags, pages);
+                } else
                         cpa_flush_range(*addr, numpages, cache);
         } else
                 cpa_flush_all(cache);
@@ -888,14 +910,28 @@ static inline int change_page_attr_set(unsigned long *addr, int numpages,
                                        pgprot_t mask, int array)
 {
         return change_page_attr_set_clr(addr, numpages, mask, __pgprot(0), 0,
-                array);
+                (array ? CPA_ARRAY : 0), NULL);
 }
 
 static inline int change_page_attr_clear(unsigned long *addr, int numpages,
                                          pgprot_t mask, int array)
 {
         return change_page_attr_set_clr(addr, numpages, __pgprot(0), mask, 0,
-                array);
+                (array ? CPA_ARRAY : 0), NULL);
+}
+
+static inline int cpa_set_pages_array(struct page **pages, int numpages,
+                                       pgprot_t mask)
+{
+        return change_page_attr_set_clr(NULL, numpages, mask, __pgprot(0), 0,
+                CPA_PAGES_ARRAY, pages);
+}
+
+static inline int cpa_clear_pages_array(struct page **pages, int numpages,
+                                         pgprot_t mask)
+{
+        return change_page_attr_set_clr(NULL, numpages, __pgprot(0), mask, 0,
+                CPA_PAGES_ARRAY, pages);
 }
 
 int _set_memory_uc(unsigned long addr, int numpages)
@@ -1043,7 +1079,7 @@ int set_memory_np(unsigned long addr, int numpages)
 int set_memory_4k(unsigned long addr, int numpages)
 {
         return change_page_attr_set_clr(&addr, numpages, __pgprot(0),
-                                        __pgprot(0), 1, 0);
+                                        __pgprot(0), 1, 0, NULL);
 }
 
 int set_pages_uc(struct page *page, int numpages)
@@ -1054,6 +1090,35 @@ int set_pages_uc(struct page *page, int numpages)
 }
 EXPORT_SYMBOL(set_pages_uc);
 
+int set_pages_array_uc(struct page **pages, int addrinarray)
+{
+        unsigned long start;
+        unsigned long end;
+        int i;
+        int free_idx;
+
+        for (i = 0; i < addrinarray; i++) {
+                start = (unsigned long)page_address(pages[i]);
+                end = start + PAGE_SIZE;
+                if (reserve_memtype(start, end, _PAGE_CACHE_UC_MINUS, NULL))
+                        goto err_out;
+        }
+
+        if (cpa_set_pages_array(pages, addrinarray,
+                        __pgprot(_PAGE_CACHE_UC_MINUS)) == 0) {
+                return 0; /* Success */
+        }
+err_out:
+        free_idx = i;
+        for (i = 0; i < free_idx; i++) {
+                start = (unsigned long)page_address(pages[i]);
+                end = start + PAGE_SIZE;
+                free_memtype(start, end);
+        }
+        return -EINVAL;
+}
+EXPORT_SYMBOL(set_pages_array_uc);
+
 int set_pages_wb(struct page *page, int numpages)
 {
         unsigned long addr = (unsigned long)page_address(page);
@@ -1062,6 +1127,26 @@ int set_pages_wb(struct page *page, int numpages)
 }
 EXPORT_SYMBOL(set_pages_wb);
 
+int set_pages_array_wb(struct page **pages, int addrinarray)
+{
+        int retval;
+        unsigned long start;
+        unsigned long end;
+        int i;
+
+        retval = cpa_clear_pages_array(pages, addrinarray,
+                        __pgprot(_PAGE_CACHE_MASK));
+
+        for (i = 0; i < addrinarray; i++) {
+                start = (unsigned long)page_address(pages[i]);
+                end = start + PAGE_SIZE;
+                free_memtype(start, end);
+        }
+
+        return retval;
+}
+EXPORT_SYMBOL(set_pages_array_wb);
+
 int set_pages_x(struct page *page, int numpages)
 {
         unsigned long addr = (unsigned long)page_address(page);
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index 2ed37158012d..640339ee4fb2 100644
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -677,10 +677,11 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
         is_ram = pat_pagerange_is_ram(paddr, paddr + size);
 
         /*
-         * reserve_pfn_range() doesn't support RAM pages.
+         * reserve_pfn_range() doesn't support RAM pages. Maintain the current
+         * behavior with RAM pages by returning success.
          */
         if (is_ram != 0)
-                return -EINVAL;
+                return 0;
 
         ret = reserve_memtype(paddr, paddr + size, want_flags, &flags);
         if (ret)
diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
index f2e477c91c1b..46c8834aedc0 100644
--- a/arch/x86/mm/pgtable_32.c
+++ b/arch/x86/mm/pgtable_32.c
@@ -50,7 +50,7 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
         }
         pte = pte_offset_kernel(pmd, vaddr);
         if (pte_val(pteval))
-                set_pte_present(&init_mm, vaddr, pte, pteval);
+                set_pte_at(&init_mm, vaddr, pte, pteval);
         else
                 pte_clear(&init_mm, vaddr, pte);
 
diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
index a654d59e4483..821e97017e95 100644
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@ -187,11 +187,6 @@ static void flush_tlb_others_ipi(const struct cpumask *cpumask,
                        cpumask, cpumask_of(smp_processor_id()));
 
         /*
-         * Make the above memory operations globally visible before
-         * sending the IPI.
-         */
-        smp_mb();
-        /*
          * We have to send the IPI only to
          * CPUs affected.
          */