Merge branch 'linus' into perf/core

Merge reason: Pick up the latest perf fixes.

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

4 files changed, 33 insertions, 33 deletions

diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 76818f926539..505a08592423 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -5,7 +5,7 @@ mainmenu "Linux/Microblaze Kernel Configuration"
 
 config MICROBLAZE
         def_bool y
-        select HAVE_LMB
+        select HAVE_MEMBLOCK
         select HAVE_FUNCTION_TRACER
         select HAVE_FUNCTION_TRACE_MCOUNT_TEST
         select HAVE_FUNCTION_GRAPH_TRACER
diff --git a/arch/microblaze/include/asm/lmb.h b/arch/microblaze/include/asm/memblock.h
index a0a0a929c293..f9c2fa331d2a 100644
--- a/arch/microblaze/include/asm/lmb.h
+++ b/arch/microblaze/include/asm/memblock.h
@@ -6,12 +6,12 @@
  * for more details.
  */
 
-#ifndef _ASM_MICROBLAZE_LMB_H
-#define _ASM_MICROBLAZE_LMB_H
+#ifndef _ASM_MICROBLAZE_MEMBLOCK_H
+#define _ASM_MICROBLAZE_MEMBLOCK_H
 
-/* LMB limit is OFF */
-#define LMB_REAL_LIMIT  0xFFFFFFFF
+/* MEMBLOCK limit is OFF */
+#define MEMBLOCK_REAL_LIMIT     0xFFFFFFFF
 
-#endif /* _ASM_MICROBLAZE_LMB_H */
+#endif /* _ASM_MICROBLAZE_MEMBLOCK_H */
 
 
diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c
index a15ef6d67ca9..427b13b4740f 100644
--- a/arch/microblaze/kernel/prom.c
+++ b/arch/microblaze/kernel/prom.c
@@ -29,7 +29,7 @@
 #include <linux/kexec.h>
 #include <linux/debugfs.h>
 #include <linux/irq.h>
-#include <linux/lmb.h>
+#include <linux/memblock.h>
 
 #include <asm/prom.h>
 #include <asm/page.h>
@@ -49,12 +49,12 @@ void __init early_init_dt_scan_chosen_arch(unsigned long node)
 
 void __init early_init_dt_add_memory_arch(u64 base, u64 size)
 {
-        lmb_add(base, size);
+        memblock_add(base, size);
 }
 
 u64 __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
 {
-        return lmb_alloc(size, align);
+        return memblock_alloc(size, align);
 }
 
 #ifdef CONFIG_EARLY_PRINTK
@@ -104,8 +104,8 @@ void __init early_init_devtree(void *params)
          */
         of_scan_flat_dt(early_init_dt_scan_chosen, NULL);
 
-        /* Scan memory nodes and rebuild LMBs */
-        lmb_init();
+        /* Scan memory nodes and rebuild MEMBLOCKs */
+        memblock_init();
         of_scan_flat_dt(early_init_dt_scan_root, NULL);
         of_scan_flat_dt(early_init_dt_scan_memory, NULL);
 
@@ -113,9 +113,9 @@ void __init early_init_devtree(void *params)
         strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE);
         parse_early_param();
 
-        lmb_analyze();
+        memblock_analyze();
 
-        pr_debug("Phys. mem: %lx\n", (unsigned long) lmb_phys_mem_size());
+        pr_debug("Phys. mem: %lx\n", (unsigned long) memblock_phys_mem_size());
 
         pr_debug(" <- early_init_devtree()\n");
 }
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index cca3579d4268..db5934989926 100644
--- a/arch/microblaze/mm/init.c
+++ b/arch/microblaze/mm/init.c
@@ -10,7 +10,7 @@
 #include <linux/bootmem.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/lmb.h>
+#include <linux/memblock.h>
 #include <linux/mm.h> /* mem_init */
 #include <linux/initrd.h>
 #include <linux/pagemap.h>
@@ -76,10 +76,10 @@ void __init setup_memory(void)
         u32 kernel_align_start, kernel_align_size;
 
         /* Find main memory where is the kernel */
-        for (i = 0; i < lmb.memory.cnt; i++) {
-                memory_start = (u32) lmb.memory.region[i].base;
-                memory_end = (u32) lmb.memory.region[i].base
-                                + (u32) lmb.memory.region[i].size;
+        for (i = 0; i < memblock.memory.cnt; i++) {
+                memory_start = (u32) memblock.memory.region[i].base;
+                memory_end = (u32) memblock.memory.region[i].base
+                                + (u32) memblock.memory.region[i].size;
                 if ((memory_start <= (u32)_text) &&
                                         ((u32)_text <= memory_end)) {
                         memory_size = memory_end - memory_start;
@@ -100,7 +100,7 @@ void __init setup_memory(void)
         kernel_align_start = PAGE_DOWN((u32)_text);
         /* ALIGN can be remove because _end in vmlinux.lds.S is align */
         kernel_align_size = PAGE_UP((u32)klimit) - kernel_align_start;
-        lmb_reserve(kernel_align_start, kernel_align_size);
+        memblock_reserve(kernel_align_start, kernel_align_size);
         printk(KERN_INFO "%s: kernel addr=0x%08x-0x%08x size=0x%08x\n",
                 __func__, kernel_align_start, kernel_align_start
                         + kernel_align_size, kernel_align_size);
@@ -141,18 +141,18 @@ void __init setup_memory(void)
         map_size = init_bootmem_node(&contig_page_data,
                 PFN_UP(TOPHYS((u32)klimit)), min_low_pfn, max_low_pfn);
 #endif
-        lmb_reserve(PFN_UP(TOPHYS((u32)klimit)) << PAGE_SHIFT, map_size);
+        memblock_reserve(PFN_UP(TOPHYS((u32)klimit)) << PAGE_SHIFT, map_size);
 
         /* free bootmem is whole main memory */
         free_bootmem(memory_start, memory_size);
 
         /* reserve allocate blocks */
-        for (i = 0; i < lmb.reserved.cnt; i++) {
+        for (i = 0; i < memblock.reserved.cnt; i++) {
                 pr_debug("reserved %d - 0x%08x-0x%08x\n", i,
-                        (u32) lmb.reserved.region[i].base,
-                        (u32) lmb_size_bytes(&lmb.reserved, i));
-                reserve_bootmem(lmb.reserved.region[i].base,
-                        lmb_size_bytes(&lmb.reserved, i) - 1, BOOTMEM_DEFAULT);
+                        (u32) memblock.reserved.region[i].base,
+                        (u32) memblock_size_bytes(&memblock.reserved, i));
+                reserve_bootmem(memblock.reserved.region[i].base,
+                        memblock_size_bytes(&memblock.reserved, i) - 1, BOOTMEM_DEFAULT);
         }
 #ifdef CONFIG_MMU
         init_bootmem_done = 1;
@@ -235,7 +235,7 @@ static void mm_cmdline_setup(void)
                 if (maxmem && memory_size > maxmem) {
                         memory_size = maxmem;
                         memory_end = memory_start + memory_size;
-                        lmb.memory.region[0].size = memory_size;
+                        memblock.memory.region[0].size = memory_size;
                 }
         }
 }
@@ -273,19 +273,19 @@ asmlinkage void __init mmu_init(void)
 {
         unsigned int kstart, ksize;
 
-        if (!lmb.reserved.cnt) {
+        if (!memblock.reserved.cnt) {
                 printk(KERN_EMERG "Error memory count\n");
                 machine_restart(NULL);
         }
 
-        if ((u32) lmb.memory.region[0].size < 0x1000000) {
+        if ((u32) memblock.memory.region[0].size < 0x1000000) {
                 printk(KERN_EMERG "Memory must be greater than 16MB\n");
                 machine_restart(NULL);
         }
         /* Find main memory where the kernel is */
-        memory_start = (u32) lmb.memory.region[0].base;
-        memory_end = (u32) lmb.memory.region[0].base +
-                                (u32) lmb.memory.region[0].size;
+        memory_start = (u32) memblock.memory.region[0].base;
+        memory_end = (u32) memblock.memory.region[0].base +
+                                (u32) memblock.memory.region[0].size;
         memory_size = memory_end - memory_start;
 
         mm_cmdline_setup(); /* FIXME parse args from command line - not used */
@@ -297,7 +297,7 @@ asmlinkage void __init mmu_init(void)
         kstart = __pa(CONFIG_KERNEL_START); /* kernel start */
         /* kernel size */
         ksize = PAGE_ALIGN(((u32)_end - (u32)CONFIG_KERNEL_START));
-        lmb_reserve(kstart, ksize);
+        memblock_reserve(kstart, ksize);
 
 #if defined(CONFIG_BLK_DEV_INITRD)
         /* Remove the init RAM disk from the available memory. */
@@ -335,7 +335,7 @@ void __init *early_get_page(void)
                  * Mem start + 32MB -> here is limit
                  * because of mem mapping from head.S
                  */
-                p = __va(lmb_alloc_base(PAGE_SIZE, PAGE_SIZE,
+                p = __va(memblock_alloc_base(PAGE_SIZE, PAGE_SIZE,
                                         memory_start + 0x2000000));
         }
         return p;