Merge tag 'v4.2-rc8' into x86/mm, before applying new changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --combined arch/m32r/include/asm/io.h
index 4c4982af6fbd8f849268dbf622728dda58baf77f,f8de767ce2bcc763979ef6e08d4ef4f862a89efb..61b8931bc19250df3af7b42b4e667749332b6be1
--- 1/arch/m32r/include/asm/io.h
--- 2/arch/m32r/include/asm/io.h
+++ b/arch/m32r/include/asm/io.h
@@@ -69,7 -69,6 +69,7 @@@ extern void iounmap(volatile void __iom
  #define ioremap_nocache(off,size) ioremap(off,size)
  #define ioremap_wc ioremap_nocache
  #define ioremap_wt ioremap_nocache
 +#define ioremap_uc ioremap_nocache
  
  /*
   * IO bus memory addresses are also 1:1 with the physical address
@@@ -175,6 -174,11 +175,11 @@@ static inline void _writel(unsigned lon
  #define iowrite16 writew
  #define iowrite32 writel
  
+ #define ioread16be(addr)      be16_to_cpu(readw(addr))
+ #define ioread32be(addr)      be32_to_cpu(readl(addr))
+ #define iowrite16be(v, addr)  writew(cpu_to_be16(v), (addr))
+ #define iowrite32be(v, addr)  writel(cpu_to_be32(v), (addr))
+ 
  #define mmiowb()
  
  #define flush_write_buffers() do { } while (0)  /* M32R_FIXME */

diff --combined arch/m68k/include/asm/io_mm.h
index a0fce34029b31890ef7fae3194a0a0941da727d9,f55cad529400f65eb38832cce8c96760a44f1aad..c98ac81582ac5c967d7bddb04ae6325bc230f8b1
--- 1/arch/m68k/include/asm/io_mm.h
--- 2/arch/m68k/include/asm/io_mm.h
+++ b/arch/m68k/include/asm/io_mm.h
@@@ -413,7 -413,8 +413,8 @@@ static inline void isa_delay(void
  #define writew(val, addr)     out_le16((addr), (val))
  #endif /* CONFIG_ATARI_ROM_ISA */
  
- #if !defined(CONFIG_ISA) && !defined(CONFIG_ATARI_ROM_ISA)
+ #if !defined(CONFIG_ISA) && !defined(CONFIG_ATARI_ROM_ISA) && \
+     !(defined(CONFIG_PCI) && defined(CONFIG_COLDFIRE))
  /*
   * We need to define dummy functions for GENERIC_IOMAP support.
   */
@@@ -467,7 -468,6 +468,7 @@@ static inline void __iomem *ioremap_noc
  {
        return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
  }
 +#define ioremap_uc ioremap_nocache
  static inline void __iomem *ioremap_wt(unsigned long physaddr,
                                         unsigned long size)
  {

diff --combined arch/x86/include/asm/io.h
index de25aad0785389c399dd12c843ca2d4d2ff0d112,cc9c61bc1abed1a661b88410512cb1e34d7ea8ae..7cfc085b6879babbc47695352835852b4846e650
--- 1/arch/x86/include/asm/io.h
--- 2/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@@ -180,8 -180,6 +180,8 @@@ static inline unsigned int isa_virt_to_
   */
  extern void __iomem *ioremap_nocache(resource_size_t offset, unsigned long size);
  extern void __iomem *ioremap_uc(resource_size_t offset, unsigned long size);
 +#define ioremap_uc ioremap_uc
 +
  extern void __iomem *ioremap_cache(resource_size_t offset, unsigned long size);
  extern void __iomem *ioremap_prot(resource_size_t offset, unsigned long size,
                                unsigned long prot_val);
@@@ -250,6 -248,12 +250,12 @@@ static inline void flush_write_buffers(
  #endif
  }
  
+ static inline void __pmem *arch_memremap_pmem(resource_size_t offset,
+       unsigned long size)
+ {
+       return (void __force __pmem *) ioremap_cache(offset, size);
+ }
+ 
  #endif /* __KERNEL__ */
  
  extern void native_io_delay(void);

diff --combined arch/x86/kernel/check.c
index f40cfd12ba66d750443e480dab1baa7c4be5e1ef,58118e207a69c4b5a249c6e9458f6b54f6295e52..145863d4d343c4138c167228550e4a0a6a9363a4
--- 1/arch/x86/kernel/check.c
--- 2/arch/x86/kernel/check.c
+++ b/arch/x86/kernel/check.c
@@@ -1,4 -1,4 +1,4 @@@
 -#include <linux/module.h>
 +#include <linux/init.h>
  #include <linux/sched.h>
  #include <linux/kthread.h>
  #include <linux/workqueue.h>
@@@ -91,7 -91,8 +91,8 @@@ void __init setup_bios_corruption_check
  
        corruption_check_size = round_up(corruption_check_size, PAGE_SIZE);
  
-       for_each_free_mem_range(i, NUMA_NO_NODE, &start, &end, NULL) {
+       for_each_free_mem_range(i, NUMA_NO_NODE, MEMBLOCK_NONE, &start, &end,
+                               NULL) {
                start = clamp_t(phys_addr_t, round_up(start, PAGE_SIZE),
                                PAGE_SIZE, corruption_check_size);
                end = clamp_t(phys_addr_t, round_down(end, PAGE_SIZE),
@@@ -162,5 -163,6 +163,5 @@@ static int start_periodic_check_for_cor
        schedule_delayed_work(&bios_check_work, 0);
        return 0;
  }
 -
 -module_init(start_periodic_check_for_corruption);
 +device_initcall(start_periodic_check_for_corruption);
  

diff --combined arch/x86/mm/init_32.c
index c23ab1ee3a9a9d15e4c043d27452ecf99deee9b4,8340e45c891a1dc879a6e23ab95fe0e2e82b5eec..68aec42545c2a3e90d3731b217f2cc097cbd8045
--- 1/arch/x86/mm/init_32.c
--- 2/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@@ -137,7 -137,6 +137,7 @@@ page_table_range_init_count(unsigned lo
  
        vaddr = start;
        pgd_idx = pgd_index(vaddr);
 +      pmd_idx = pmd_index(vaddr);
  
        for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd_idx++) {
                for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
@@@ -434,7 -433,7 +434,7 @@@ void __init add_highpages_with_active_r
        phys_addr_t start, end;
        u64 i;
  
-       for_each_free_mem_range(i, nid, &start, &end, NULL) {
+       for_each_free_mem_range(i, nid, MEMBLOCK_NONE, &start, &end, NULL) {
                unsigned long pfn = clamp_t(unsigned long, PFN_UP(start),
                                            start_pfn, end_pfn);
                unsigned long e_pfn = clamp_t(unsigned long, PFN_DOWN(end),