Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 mm changes from Ingo Molnar:
 "The main changes in this cycle were:

   - reduce the x86/32 PAE per task PGD allocation overhead from 4K to
     0.032k (Fenghua Yu)

   - early_ioremap/memunmap() usage cleanups (Juergen Gross)

   - gbpages support cleanups (Luis R Rodriguez)

   - improve AMD Bulldozer (family 0x15) ASLR I$ aliasing workaround to
     increase randomization by 3 bits (per bootup) (Hector
     Marco-Gisbert)

   - misc fixlets"

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm: Improve AMD Bulldozer ASLR workaround
  x86/mm/pat: Initialize __cachemode2pte_tbl[] and __pte2cachemode_tbl[] in a bit more readable fashion
  init.h: Clean up the __setup()/early_param() macros
  x86/mm: Simplify probe_page_size_mask()
  x86/mm: Further simplify 1 GB kernel linear mappings handling
  x86/mm: Use early_param_on_off() for direct_gbpages
  init.h: Add early_param_on_off()
  x86/mm: Simplify enabling direct_gbpages
  x86/mm: Use IS_ENABLED() for direct_gbpages
  x86/mm: Unexport set_memory_ro() and set_memory_rw()
  x86/mm, efi: Use early_ioremap() in arch/x86/platform/efi/efi-bgrt.c
  x86/mm: Use early_memunmap() instead of early_iounmap()
  x86/mm/pat: Ensure different messages in STRICT_DEVMEM and PAT cases
  x86/mm: Reduce PAE-mode per task pgd allocation overhead from 4K to 32 bytes

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 014466b152b5..d74ac33290ae 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -354,7 +354,7 @@ static void __init relocate_initrd(void)
                 mapaddr = ramdisk_image & PAGE_MASK;
                 p = early_memremap(mapaddr, clen+slop);
                 memcpy(q, p+slop, clen);
-                early_iounmap(p, clen+slop);
+                early_memunmap(p, clen+slop);
                 q += clen;
                 ramdisk_image += clen;
                 ramdisk_size  -= clen;
@@ -438,7 +438,7 @@ static void __init parse_setup_data(void)
                 data_len = data->len + sizeof(struct setup_data);
                 data_type = data->type;
                 pa_next = data->next;
-                early_iounmap(data, sizeof(*data));
+                early_memunmap(data, sizeof(*data));
 
                 switch (data_type) {
                 case SETUP_E820_EXT:
@@ -470,7 +470,7 @@ static void __init e820_reserve_setup_data(void)
                          E820_RAM, E820_RESERVED_KERN);
                 found = 1;
                 pa_data = data->next;
-                early_iounmap(data, sizeof(*data));
+                early_memunmap(data, sizeof(*data));
         }
         if (!found)
                 return;
@@ -491,7 +491,7 @@ static void __init memblock_x86_reserve_range_setup_data(void)
                 data = early_memremap(pa_data, sizeof(*data));
                 memblock_reserve(pa_data, sizeof(*data) + data->len);
                 pa_data = data->next;
-                early_iounmap(data, sizeof(*data));
+                early_memunmap(data, sizeof(*data));
         }
 }