Merge branch 'linus' into perfcounters/core

Conflicts:
	arch/x86/include/asm/kmap_types.h
	include/linux/mm.h

	include/asm-generic/kmap_types.h

Merge reason: We crossed changes with kmap_types.h cleanups in mainline.

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

diff --cc arch/powerpc/include/asm/hw_irq.h
Simple merge

diff --cc include/asm-generic/kmap_types.h
index 58c33055c304f65a1c6f576d1d1e8b0c8533afad,54e8b3d956b7fe9ba20082844b50237d27050681..eddbce0f9fb9447f8fae3534ed0a0d3f4373dc7f
--- 1/include/asm-generic/kmap_types.h
--- 2/include/asm-generic/kmap_types.h
+++ b/include/asm-generic/kmap_types.h
@@@ -24,7 -24,7 +24,10 @@@ D(12)        KM_SOFTIRQ1
  D(13) KM_SYNC_ICACHE,
  D(14) KM_SYNC_DCACHE,
  D(15) KM_UML_USERCOPY, /* UML specific, for copy_*_user - used in do_op_one_page */
--D(16) KM_TYPE_NR
++D(16) KM_IRQ_PTE,
++D(17) KM_NMI,
++D(18) KM_NMI_PTE,
++D(19) KM_TYPE_NR
  };
  
  #undef D

diff --cc include/linux/mm.h
index b457bc047ab153651313cf75d44cb64905318c05,d88d6fc530ade07b88272c033804404c064c2440..cf260d848eb925edf884e4d82a8477a1f890f6f4
--- 1/include/linux/mm.h
--- 2/include/linux/mm.h
+++ b/include/linux/mm.h
@@@ -849,25 -853,6 +853,12 @@@ extern int mprotect_fixup(struct vm_are
                          struct vm_area_struct **pprev, unsigned long start,
                          unsigned long end, unsigned long newflags);
  
- /*
-  * get_user_pages_fast provides equivalent functionality to get_user_pages,
-  * operating on current and current->mm (force=0 and doesn't return any vmas).
-  *
-  * get_user_pages_fast may take mmap_sem and page tables, so no assumptions
-  * can be made about locking. get_user_pages_fast is to be implemented in a
-  * way that is advantageous (vs get_user_pages()) when the user memory area is
-  * already faulted in and present in ptes. However if the pages have to be
-  * faulted in, it may turn out to be slightly slower).
-  */
- int get_user_pages_fast(unsigned long start, int nr_pages, int write,
-                       struct page **pages);
- 
 +/*
 + * doesn't attempt to fault and will return short.
 + */
 +int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
 +                        struct page **pages);
 +
  /*
   * A callback you can register to apply pressure to ageable caches.
   *