diff options
Diffstat (limited to 'arch/microblaze/kernel/prom.c')
-rw-r--r-- | arch/microblaze/kernel/prom.c | 14 |
1 files changed, 7 insertions, 7 deletions
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 @@ | |||
29 | #include <linux/kexec.h> | 29 | #include <linux/kexec.h> |
30 | #include <linux/debugfs.h> | 30 | #include <linux/debugfs.h> |
31 | #include <linux/irq.h> | 31 | #include <linux/irq.h> |
32 | #include <linux/lmb.h> | 32 | #include <linux/memblock.h> |
33 | 33 | ||
34 | #include <asm/prom.h> | 34 | #include <asm/prom.h> |
35 | #include <asm/page.h> | 35 | #include <asm/page.h> |
@@ -49,12 +49,12 @@ void __init early_init_dt_scan_chosen_arch(unsigned long node) | |||
49 | 49 | ||
50 | void __init early_init_dt_add_memory_arch(u64 base, u64 size) | 50 | void __init early_init_dt_add_memory_arch(u64 base, u64 size) |
51 | { | 51 | { |
52 | lmb_add(base, size); | 52 | memblock_add(base, size); |
53 | } | 53 | } |
54 | 54 | ||
55 | u64 __init early_init_dt_alloc_memory_arch(u64 size, u64 align) | 55 | u64 __init early_init_dt_alloc_memory_arch(u64 size, u64 align) |
56 | { | 56 | { |
57 | return lmb_alloc(size, align); | 57 | return memblock_alloc(size, align); |
58 | } | 58 | } |
59 | 59 | ||
60 | #ifdef CONFIG_EARLY_PRINTK | 60 | #ifdef CONFIG_EARLY_PRINTK |
@@ -104,8 +104,8 @@ void __init early_init_devtree(void *params) | |||
104 | */ | 104 | */ |
105 | of_scan_flat_dt(early_init_dt_scan_chosen, NULL); | 105 | of_scan_flat_dt(early_init_dt_scan_chosen, NULL); |
106 | 106 | ||
107 | /* Scan memory nodes and rebuild LMBs */ | 107 | /* Scan memory nodes and rebuild MEMBLOCKs */ |
108 | lmb_init(); | 108 | memblock_init(); |
109 | of_scan_flat_dt(early_init_dt_scan_root, NULL); | 109 | of_scan_flat_dt(early_init_dt_scan_root, NULL); |
110 | of_scan_flat_dt(early_init_dt_scan_memory, NULL); | 110 | of_scan_flat_dt(early_init_dt_scan_memory, NULL); |
111 | 111 | ||
@@ -113,9 +113,9 @@ void __init early_init_devtree(void *params) | |||
113 | strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE); | 113 | strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE); |
114 | parse_early_param(); | 114 | parse_early_param(); |
115 | 115 | ||
116 | lmb_analyze(); | 116 | memblock_analyze(); |
117 | 117 | ||
118 | pr_debug("Phys. mem: %lx\n", (unsigned long) lmb_phys_mem_size()); | 118 | pr_debug("Phys. mem: %lx\n", (unsigned long) memblock_phys_mem_size()); |
119 | 119 | ||
120 | pr_debug(" <- early_init_devtree()\n"); | 120 | pr_debug(" <- early_init_devtree()\n"); |
121 | } | 121 | } |