Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95f72d1e authored by Yinghai Lu's avatar Yinghai Lu Committed by Benjamin Herrenschmidt
Browse files

lmb: rename to memblock 



via following scripts

      FILES=$(find * -type f | grep -vE 'oprofile|[^K]config')

      sed -i \
        -e 's/lmb/memblock/g' \
        -e 's/LMB/MEMBLOCK/g' \
        $FILES

      for N in $(find . -name lmb.[ch]); do
        M=$(echo $N | sed 's/lmb/memblock/g')
        mv $N $M
      done

and remove some wrong change like lmbench and dlmb etc.

also move memblock.c from lib/ to mm/

Suggested-by: default avatarIngo Molnar <mingo@elte.hu>
Acked-by: default avatar"H. Peter Anvin" <hpa@zytor.com>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 1c5474a6

Documentation/kernel-parameters.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -1265,7 +1265,7 @@ and is between 256 and 4096 characters. It is defined in the file 
			If there are multiple matching configurations changing

			If there are multiple matching configurations changing

			the same attribute, the last one is used.

			the same attribute, the last one is used.





	lmb=debug	[KNL] Enable lmb debug messages.

	memblock=debug	[KNL] Enable memblock debug messages.





	load_ramdisk=	[RAM] List of ramdisks to load from floppy

	load_ramdisk=	[RAM] List of ramdisks to load from floppy

			See Documentation/blockdev/ramdisk.txt.

			See Documentation/blockdev/ramdisk.txt.

arch/microblaze/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -5,7 +5,7 @@ mainmenu "Linux/Microblaze Kernel Configuration" 




config MICROBLAZE

config MICROBLAZE

	def_bool y

	def_bool y

	select HAVE_LMB

	select HAVE_MEMBLOCK

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_TRACE_MCOUNT_TEST

	select HAVE_FUNCTION_TRACE_MCOUNT_TEST

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_GRAPH_TRACER

arch/microblaze/include/asm/lmb.h→arch/microblaze/include/asm/memblock.h

+5 −5
Original line number Original line Diff line number Diff line
@@ -6,12 +6,12 @@ 
 * for more details.

 * for more details.

 */

 */





#ifndef _ASM_MICROBLAZE_LMB_H

#ifndef _ASM_MICROBLAZE_MEMBLOCK_H

#define _ASM_MICROBLAZE_LMB_H

#define _ASM_MICROBLAZE_MEMBLOCK_H





/* LMB limit is OFF */

/* MEMBLOCK limit is OFF */

#define LMB_REAL_LIMIT	0xFFFFFFFF

#define MEMBLOCK_REAL_LIMIT	0xFFFFFFFF





#endif /* _ASM_MICROBLAZE_LMB_H */

#endif /* _ASM_MICROBLAZE_MEMBLOCK_H */

arch/microblaze/kernel/prom.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include <linux/kexec.h>

#include <linux/kexec.h>

#include <linux/debugfs.h>

#include <linux/debugfs.h>

#include <linux/irq.h>

#include <linux/irq.h>

#include <linux/lmb.h>

#include <linux/memblock.h>





#include <asm/prom.h>

#include <asm/prom.h>

#include <asm/page.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)

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)

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

#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);

	of_scan_flat_dt(early_init_dt_scan_chosen, NULL);





	/* Scan memory nodes and rebuild LMBs */

	/* Scan memory nodes and rebuild MEMBLOCKs */

	lmb_init();

	memblock_init();

	of_scan_flat_dt(early_init_dt_scan_root, NULL);

	of_scan_flat_dt(early_init_dt_scan_root, NULL);

	of_scan_flat_dt(early_init_dt_scan_memory, 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);

	strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE);

	parse_early_param();

	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");

	pr_debug(" <- early_init_devtree()\n");

}

}

arch/microblaze/mm/init.c

+20 −20
Original line number Original line Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <linux/bootmem.h>

#include <linux/bootmem.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/lmb.h>

#include <linux/memblock.h>

#include <linux/mm.h> /* mem_init */

#include <linux/mm.h> /* mem_init */

#include <linux/initrd.h>

#include <linux/initrd.h>

#include <linux/pagemap.h>

#include <linux/pagemap.h>
@@ -76,10 +76,10 @@ void __init setup_memory(void) 
	u32 kernel_align_start, kernel_align_size;

	u32 kernel_align_start, kernel_align_size;





	/* Find main memory where is the kernel */

	/* Find main memory where is the kernel */

	for (i = 0; i < lmb.memory.cnt; i++) {

	for (i = 0; i < memblock.memory.cnt; i++) {

		memory_start = (u32) lmb.memory.region[i].base;

		memory_start = (u32) memblock.memory.region[i].base;

		memory_end = (u32) lmb.memory.region[i].base

		memory_end = (u32) memblock.memory.region[i].base

				+ (u32) lmb.memory.region[i].size;

				+ (u32) memblock.memory.region[i].size;

		if ((memory_start <= (u32)_text) &&

		if ((memory_start <= (u32)_text) &&

					((u32)_text <= memory_end)) {

					((u32)_text <= memory_end)) {

			memory_size = memory_end - memory_start;

			memory_size = memory_end - memory_start;
@@ -100,7 +100,7 @@ void __init setup_memory(void) 
	kernel_align_start = PAGE_DOWN((u32)_text);

	kernel_align_start = PAGE_DOWN((u32)_text);

	/* ALIGN can be remove because _end in vmlinux.lds.S is align */

	/* ALIGN can be remove because _end in vmlinux.lds.S is align */

	kernel_align_size = PAGE_UP((u32)klimit) - kernel_align_start;

	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",

	printk(KERN_INFO "%s: kernel addr=0x%08x-0x%08x size=0x%08x\n",

		__func__, kernel_align_start, kernel_align_start

		__func__, kernel_align_start, kernel_align_start

			+ kernel_align_size, kernel_align_size);

			+ kernel_align_size, kernel_align_size);
@@ -141,18 +141,18 @@ void __init setup_memory(void) 
	map_size = init_bootmem_node(&contig_page_data,

	map_size = init_bootmem_node(&contig_page_data,

		PFN_UP(TOPHYS((u32)klimit)), min_low_pfn, max_low_pfn);

		PFN_UP(TOPHYS((u32)klimit)), min_low_pfn, max_low_pfn);

#endif

#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 is whole main memory */

	free_bootmem(memory_start, memory_size);

	free_bootmem(memory_start, memory_size);





	/* reserve allocate blocks */

	/* 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,

		pr_debug("reserved %d - 0x%08x-0x%08x\n", i,

			(u32) lmb.reserved.region[i].base,

			(u32) memblock.reserved.region[i].base,

			(u32) lmb_size_bytes(&lmb.reserved, i));

			(u32) memblock_size_bytes(&memblock.reserved, i));

		reserve_bootmem(lmb.reserved.region[i].base,

		reserve_bootmem(memblock.reserved.region[i].base,

			lmb_size_bytes(&lmb.reserved, i) - 1, BOOTMEM_DEFAULT);

			memblock_size_bytes(&memblock.reserved, i) - 1, BOOTMEM_DEFAULT);

	}

	}

#ifdef CONFIG_MMU

#ifdef CONFIG_MMU

	init_bootmem_done = 1;

	init_bootmem_done = 1;
@@ -235,7 +235,7 @@ static void mm_cmdline_setup(void) 
		if (maxmem && memory_size > maxmem) {

		if (maxmem && memory_size > maxmem) {

			memory_size = maxmem;

			memory_size = maxmem;

			memory_end = memory_start + memory_size;

			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;

	unsigned int kstart, ksize;





	if (!lmb.reserved.cnt) {

	if (!memblock.reserved.cnt) {

		printk(KERN_EMERG "Error memory count\n");

		printk(KERN_EMERG "Error memory count\n");

		machine_restart(NULL);

		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");

		printk(KERN_EMERG "Memory must be greater than 16MB\n");

		machine_restart(NULL);

		machine_restart(NULL);

	}

	}

	/* Find main memory where the kernel is */

	/* Find main memory where the kernel is */

	memory_start = (u32) lmb.memory.region[0].base;

	memory_start = (u32) memblock.memory.region[0].base;

	memory_end = (u32) lmb.memory.region[0].base +

	memory_end = (u32) memblock.memory.region[0].base +

				(u32) lmb.memory.region[0].size;

				(u32) memblock.memory.region[0].size;

	memory_size = memory_end - memory_start;

	memory_size = memory_end - memory_start;





	mm_cmdline_setup(); /* FIXME parse args from command line - not used */

	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 */

	kstart = __pa(CONFIG_KERNEL_START); /* kernel start */

	/* kernel size */

	/* kernel size */

	ksize = PAGE_ALIGN(((u32)_end - (u32)CONFIG_KERNEL_START));

	ksize = PAGE_ALIGN(((u32)_end - (u32)CONFIG_KERNEL_START));

	lmb_reserve(kstart, ksize);

	memblock_reserve(kstart, ksize);





#if defined(CONFIG_BLK_DEV_INITRD)

#if defined(CONFIG_BLK_DEV_INITRD)

	/* Remove the init RAM disk from the available memory. */

	/* 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

		 * Mem start + 32MB -> here is limit

		 * because of mem mapping from head.S

		 * 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));

					memory_start + 0x2000000));

	}

	}

	return p;

	return p;