Merge branch 'linus' into perf/urgent

Merge reason: we need to fix a non-trivial merge conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

12 files changed, 52 insertions, 56 deletions

diff --git a/arch/arm/mm/copypage-fa.c b/arch/arm/mm/copypage-fa.c
index d2852e1635b1..d130a5ece5d5 100644
--- a/arch/arm/mm/copypage-fa.c
+++ b/arch/arm/mm/copypage-fa.c
@@ -44,11 +44,11 @@ void fa_copy_user_highpage(struct page *to, struct page *from,
 {
         void *kto, *kfrom;
 
-        kto = kmap_atomic(to, KM_USER0);
-        kfrom = kmap_atomic(from, KM_USER1);
+        kto = kmap_atomic(to);
+        kfrom = kmap_atomic(from);
         fa_copy_user_page(kto, kfrom);
-        kunmap_atomic(kfrom, KM_USER1);
-        kunmap_atomic(kto, KM_USER0);
+        kunmap_atomic(kfrom);
+        kunmap_atomic(kto);
 }
 
 /*
@@ -58,7 +58,7 @@ void fa_copy_user_highpage(struct page *to, struct page *from,
  */
 void fa_clear_user_highpage(struct page *page, unsigned long vaddr)
 {
-        void *ptr, *kaddr = kmap_atomic(page, KM_USER0);
+        void *ptr, *kaddr = kmap_atomic(page);
         asm volatile("\
         mov     r1, %2                          @ 1\n\
         mov     r2, #0                          @ 1\n\
@@ -77,7 +77,7 @@ void fa_clear_user_highpage(struct page *page, unsigned long vaddr)
         : "=r" (ptr)
         : "0" (kaddr), "I" (PAGE_SIZE / 32)
         : "r1", "r2", "r3", "ip", "lr");
-        kunmap_atomic(kaddr, KM_USER0);
+        kunmap_atomic(kaddr);
 }
 
 struct cpu_user_fns fa_user_fns __initdata = {
diff --git a/arch/arm/mm/copypage-feroceon.c b/arch/arm/mm/copypage-feroceon.c
index ac163de7dc01..49ee0c1a7209 100644
--- a/arch/arm/mm/copypage-feroceon.c
+++ b/arch/arm/mm/copypage-feroceon.c
@@ -72,17 +72,17 @@ void feroceon_copy_user_highpage(struct page *to, struct page *from,
 {
         void *kto, *kfrom;
 
-        kto = kmap_atomic(to, KM_USER0);
-        kfrom = kmap_atomic(from, KM_USER1);
+        kto = kmap_atomic(to);
+        kfrom = kmap_atomic(from);
         flush_cache_page(vma, vaddr, page_to_pfn(from));
         feroceon_copy_user_page(kto, kfrom);
-        kunmap_atomic(kfrom, KM_USER1);
-        kunmap_atomic(kto, KM_USER0);
+        kunmap_atomic(kfrom);
+        kunmap_atomic(kto);
 }
 
 void feroceon_clear_user_highpage(struct page *page, unsigned long vaddr)
 {
-        void *ptr, *kaddr = kmap_atomic(page, KM_USER0);
+        void *ptr, *kaddr = kmap_atomic(page);
         asm volatile ("\
         mov     r1, %2                          \n\
         mov     r2, #0                          \n\
@@ -102,7 +102,7 @@ void feroceon_clear_user_highpage(struct page *page, unsigned long vaddr)
         : "=r" (ptr)
         : "0" (kaddr), "I" (PAGE_SIZE / 32)
         : "r1", "r2", "r3", "r4", "r5", "r6", "r7", "ip", "lr");
-        kunmap_atomic(kaddr, KM_USER0);
+        kunmap_atomic(kaddr);
 }
 
 struct cpu_user_fns feroceon_user_fns __initdata = {
diff --git a/arch/arm/mm/copypage-v3.c b/arch/arm/mm/copypage-v3.c
index f72303e1d804..3935bddd4769 100644
--- a/arch/arm/mm/copypage-v3.c
+++ b/arch/arm/mm/copypage-v3.c
@@ -42,11 +42,11 @@ void v3_copy_user_highpage(struct page *to, struct page *from,
 {
         void *kto, *kfrom;
 
-        kto = kmap_atomic(to, KM_USER0);
-        kfrom = kmap_atomic(from, KM_USER1);
+        kto = kmap_atomic(to);
+        kfrom = kmap_atomic(from);
         v3_copy_user_page(kto, kfrom);
-        kunmap_atomic(kfrom, KM_USER1);
-        kunmap_atomic(kto, KM_USER0);
+        kunmap_atomic(kfrom);
+        kunmap_atomic(kto);
 }
 
 /*
@@ -56,7 +56,7 @@ void v3_copy_user_highpage(struct page *to, struct page *from,
  */
 void v3_clear_user_highpage(struct page *page, unsigned long vaddr)
 {
-        void *ptr, *kaddr = kmap_atomic(page, KM_USER0);
+        void *ptr, *kaddr = kmap_atomic(page);
         asm volatile("\n\
         mov     r1, %2                          @ 1\n\
         mov     r2, #0                          @ 1\n\
@@ -72,7 +72,7 @@ void v3_clear_user_highpage(struct page *page, unsigned long vaddr)
         : "=r" (ptr)
         : "0" (kaddr), "I" (PAGE_SIZE / 64)
         : "r1", "r2", "r3", "ip", "lr");
-        kunmap_atomic(kaddr, KM_USER0);
+        kunmap_atomic(kaddr);
 }
 
 struct cpu_user_fns v3_user_fns __initdata = {
diff --git a/arch/arm/mm/copypage-v4mc.c b/arch/arm/mm/copypage-v4mc.c
index 7d0a8c230342..ec8c3befb9c8 100644
--- a/arch/arm/mm/copypage-v4mc.c
+++ b/arch/arm/mm/copypage-v4mc.c
@@ -71,7 +71,7 @@ mc_copy_user_page(void *from, void *to)
 void v4_mc_copy_user_highpage(struct page *to, struct page *from,
         unsigned long vaddr, struct vm_area_struct *vma)
 {
-        void *kto = kmap_atomic(to, KM_USER1);
+        void *kto = kmap_atomic(to);
 
         if (!test_and_set_bit(PG_dcache_clean, &from->flags))
                 __flush_dcache_page(page_mapping(from), from);
@@ -85,7 +85,7 @@ void v4_mc_copy_user_highpage(struct page *to, struct page *from,
 
         raw_spin_unlock(&minicache_lock);
 
-        kunmap_atomic(kto, KM_USER1);
+        kunmap_atomic(kto);
 }
 
 /*
@@ -93,7 +93,7 @@ void v4_mc_copy_user_highpage(struct page *to, struct page *from,
  */
 void v4_mc_clear_user_highpage(struct page *page, unsigned long vaddr)
 {
-        void *ptr, *kaddr = kmap_atomic(page, KM_USER0);
+        void *ptr, *kaddr = kmap_atomic(page);
         asm volatile("\
         mov     r1, %2                          @ 1\n\
         mov     r2, #0                          @ 1\n\
@@ -111,7 +111,7 @@ void v4_mc_clear_user_highpage(struct page *page, unsigned long vaddr)
         : "=r" (ptr)
         : "0" (kaddr), "I" (PAGE_SIZE / 64)
         : "r1", "r2", "r3", "ip", "lr");
-        kunmap_atomic(kaddr, KM_USER0);
+        kunmap_atomic(kaddr);
 }
 
 struct cpu_user_fns v4_mc_user_fns __initdata = {
diff --git a/arch/arm/mm/copypage-v4wb.c b/arch/arm/mm/copypage-v4wb.c
index cb589cbb2b6c..067d0fdd630c 100644
--- a/arch/arm/mm/copypage-v4wb.c
+++ b/arch/arm/mm/copypage-v4wb.c
@@ -52,12 +52,12 @@ void v4wb_copy_user_highpage(struct page *to, struct page *from,
 {
         void *kto, *kfrom;
 
-        kto = kmap_atomic(to, KM_USER0);
-        kfrom = kmap_atomic(from, KM_USER1);
+        kto = kmap_atomic(to);
+        kfrom = kmap_atomic(from);
         flush_cache_page(vma, vaddr, page_to_pfn(from));
         v4wb_copy_user_page(kto, kfrom);
-        kunmap_atomic(kfrom, KM_USER1);
-        kunmap_atomic(kto, KM_USER0);
+        kunmap_atomic(kfrom);
+        kunmap_atomic(kto);
 }
 
 /*
@@ -67,7 +67,7 @@ void v4wb_copy_user_highpage(struct page *to, struct page *from,
  */
 void v4wb_clear_user_highpage(struct page *page, unsigned long vaddr)
 {
-        void *ptr, *kaddr = kmap_atomic(page, KM_USER0);
+        void *ptr, *kaddr = kmap_atomic(page);
         asm volatile("\
         mov     r1, %2                          @ 1\n\
         mov     r2, #0                          @ 1\n\
@@ -86,7 +86,7 @@ void v4wb_clear_user_highpage(struct page *page, unsigned long vaddr)
         : "=r" (ptr)
         : "0" (kaddr), "I" (PAGE_SIZE / 64)
         : "r1", "r2", "r3", "ip", "lr");
-        kunmap_atomic(kaddr, KM_USER0);
+        kunmap_atomic(kaddr);
 }
 
 struct cpu_user_fns v4wb_user_fns __initdata = {
diff --git a/arch/arm/mm/copypage-v4wt.c b/arch/arm/mm/copypage-v4wt.c
index 30c7d048a324..b85c5da2e510 100644
--- a/arch/arm/mm/copypage-v4wt.c
+++ b/arch/arm/mm/copypage-v4wt.c
@@ -48,11 +48,11 @@ void v4wt_copy_user_highpage(struct page *to, struct page *from,
 {
         void *kto, *kfrom;
 
-        kto = kmap_atomic(to, KM_USER0);
-        kfrom = kmap_atomic(from, KM_USER1);
+        kto = kmap_atomic(to);
+        kfrom = kmap_atomic(from);
         v4wt_copy_user_page(kto, kfrom);
-        kunmap_atomic(kfrom, KM_USER1);
-        kunmap_atomic(kto, KM_USER0);
+        kunmap_atomic(kfrom);
+        kunmap_atomic(kto);
 }
 
 /*
@@ -62,7 +62,7 @@ void v4wt_copy_user_highpage(struct page *to, struct page *from,
  */
 void v4wt_clear_user_highpage(struct page *page, unsigned long vaddr)
 {
-        void *ptr, *kaddr = kmap_atomic(page, KM_USER0);
+        void *ptr, *kaddr = kmap_atomic(page);
         asm volatile("\
         mov     r1, %2                          @ 1\n\
         mov     r2, #0                          @ 1\n\
@@ -79,7 +79,7 @@ void v4wt_clear_user_highpage(struct page *page, unsigned long vaddr)
         : "=r" (ptr)
         : "0" (kaddr), "I" (PAGE_SIZE / 64)
         : "r1", "r2", "r3", "ip", "lr");
-        kunmap_atomic(kaddr, KM_USER0);
+        kunmap_atomic(kaddr);
 }
 
 struct cpu_user_fns v4wt_user_fns __initdata = {
diff --git a/arch/arm/mm/copypage-v6.c b/arch/arm/mm/copypage-v6.c
index 3d9a1552cef6..8b03a5814d00 100644
--- a/arch/arm/mm/copypage-v6.c
+++ b/arch/arm/mm/copypage-v6.c
@@ -38,11 +38,11 @@ static void v6_copy_user_highpage_nonaliasing(struct page *to,
 {
         void *kto, *kfrom;
 
-        kfrom = kmap_atomic(from, KM_USER0);
-        kto = kmap_atomic(to, KM_USER1);
+        kfrom = kmap_atomic(from);
+        kto = kmap_atomic(to);
         copy_page(kto, kfrom);
-        kunmap_atomic(kto, KM_USER1);
-        kunmap_atomic(kfrom, KM_USER0);
+        kunmap_atomic(kto);
+        kunmap_atomic(kfrom);
 }
 
 /*
@@ -51,9 +51,9 @@ static void v6_copy_user_highpage_nonaliasing(struct page *to,
  */
 static void v6_clear_user_highpage_nonaliasing(struct page *page, unsigned long vaddr)
 {
-        void *kaddr = kmap_atomic(page, KM_USER0);
+        void *kaddr = kmap_atomic(page);
         clear_page(kaddr);
-        kunmap_atomic(kaddr, KM_USER0);
+        kunmap_atomic(kaddr);
 }
 
 /*
diff --git a/arch/arm/mm/copypage-xsc3.c b/arch/arm/mm/copypage-xsc3.c
index f9cde0702f1e..03a2042aced5 100644
--- a/arch/arm/mm/copypage-xsc3.c
+++ b/arch/arm/mm/copypage-xsc3.c
@@ -75,12 +75,12 @@ void xsc3_mc_copy_user_highpage(struct page *to, struct page *from,
 {
         void *kto, *kfrom;
 
-        kto = kmap_atomic(to, KM_USER0);
-        kfrom = kmap_atomic(from, KM_USER1);
+        kto = kmap_atomic(to);
+        kfrom = kmap_atomic(from);
         flush_cache_page(vma, vaddr, page_to_pfn(from));
         xsc3_mc_copy_user_page(kto, kfrom);
-        kunmap_atomic(kfrom, KM_USER1);
-        kunmap_atomic(kto, KM_USER0);
+        kunmap_atomic(kfrom);
+        kunmap_atomic(kto);
 }
 
 /*
@@ -90,7 +90,7 @@ void xsc3_mc_copy_user_highpage(struct page *to, struct page *from,
  */
 void xsc3_mc_clear_user_highpage(struct page *page, unsigned long vaddr)
 {
-        void *ptr, *kaddr = kmap_atomic(page, KM_USER0);
+        void *ptr, *kaddr = kmap_atomic(page);
         asm volatile ("\
         mov     r1, %2                          \n\
         mov     r2, #0                          \n\
@@ -105,7 +105,7 @@ void xsc3_mc_clear_user_highpage(struct page *page, unsigned long vaddr)
         : "=r" (ptr)
         : "0" (kaddr), "I" (PAGE_SIZE / 32)
         : "r1", "r2", "r3");
-        kunmap_atomic(kaddr, KM_USER0);
+        kunmap_atomic(kaddr);
 }
 
 struct cpu_user_fns xsc3_mc_user_fns __initdata = {
diff --git a/arch/arm/mm/copypage-xscale.c b/arch/arm/mm/copypage-xscale.c
index 610c24ced310..439d106ae638 100644
--- a/arch/arm/mm/copypage-xscale.c
+++ b/arch/arm/mm/copypage-xscale.c
@@ -93,7 +93,7 @@ mc_copy_user_page(void *from, void *to)
 void xscale_mc_copy_user_highpage(struct page *to, struct page *from,
         unsigned long vaddr, struct vm_area_struct *vma)
 {
-        void *kto = kmap_atomic(to, KM_USER1);
+        void *kto = kmap_atomic(to);
 
         if (!test_and_set_bit(PG_dcache_clean, &from->flags))
                 __flush_dcache_page(page_mapping(from), from);
@@ -107,7 +107,7 @@ void xscale_mc_copy_user_highpage(struct page *to, struct page *from,
 
         raw_spin_unlock(&minicache_lock);
 
-        kunmap_atomic(kto, KM_USER1);
+        kunmap_atomic(kto);
 }
 
 /*
@@ -116,7 +116,7 @@ void xscale_mc_copy_user_highpage(struct page *to, struct page *from,
 void
 xscale_mc_clear_user_highpage(struct page *page, unsigned long vaddr)
 {
-        void *ptr, *kaddr = kmap_atomic(page, KM_USER0);
+        void *ptr, *kaddr = kmap_atomic(page);
         asm volatile(
         "mov    r1, %2                          \n\
         mov     r2, #0                          \n\
@@ -133,7 +133,7 @@ xscale_mc_clear_user_highpage(struct page *page, unsigned long vaddr)
         : "=r" (ptr)
         : "0" (kaddr), "I" (PAGE_SIZE / 32)
         : "r1", "r2", "r3", "ip");
-        kunmap_atomic(kaddr, KM_USER0);
+        kunmap_atomic(kaddr);
 }
 
 struct cpu_user_fns xscale_mc_user_fns __initdata = {
diff --git a/arch/arm/mm/highmem.c b/arch/arm/mm/highmem.c
index 807c0573abbe..5a21505d7550 100644
--- a/arch/arm/mm/highmem.c
+++ b/arch/arm/mm/highmem.c
@@ -36,7 +36,7 @@ void kunmap(struct page *page)
 }
 EXPORT_SYMBOL(kunmap);
 
-void *__kmap_atomic(struct page *page)
+void *kmap_atomic(struct page *page)
 {
         unsigned int idx;
         unsigned long vaddr;
@@ -81,7 +81,7 @@ void *__kmap_atomic(struct page *page)
 
         return (void *)vaddr;
 }
-EXPORT_SYMBOL(__kmap_atomic);
+EXPORT_SYMBOL(kmap_atomic);
 
 void __kunmap_atomic(void *kvaddr)
 {
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 5dc7d127a40f..245a55a0a5bb 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -32,7 +32,6 @@
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include <asm/memblock.h>
 
 #include "mm.h"
 
diff --git a/arch/arm/mm/iomap.c b/arch/arm/mm/iomap.c
index e62956e12030..4614208369f1 100644
--- a/arch/arm/mm/iomap.c
+++ b/arch/arm/mm/iomap.c
@@ -32,9 +32,6 @@ EXPORT_SYMBOL(pcibios_min_io);
 unsigned long pcibios_min_mem = 0x01000000;
 EXPORT_SYMBOL(pcibios_min_mem);
 
-unsigned int pci_flags = PCI_REASSIGN_ALL_RSRC;
-EXPORT_SYMBOL(pci_flags);
-
 void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
 {
         if ((unsigned long)addr >= VMALLOC_START &&