git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
microblaze
/
kernel
/
prom.c
diff --git
a/arch/microblaze/kernel/prom.c
b/arch/microblaze/kernel/prom.c
index a15ef6d67ca92e037628f1c9808db4f5cd55e5ad..427b13b4740f822c95362f10a2510359e75fbd0a 100644
(file)
--- 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/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>
#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)
{
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
LMB
s */
-
lmb
_init();
+ /* Scan memory nodes and rebuild
MEMBLOCK
s */
+
memblock
_init();
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_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();
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");
}
pr_debug(" <- early_init_devtree()\n");
}