diff options
Diffstat (limited to 'arch/openrisc/kernel/prom.c')
-rw-r--r-- | arch/openrisc/kernel/prom.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/openrisc/kernel/prom.c b/arch/openrisc/kernel/prom.c index 1bb58ba89afa..3d4478f6c942 100644 --- a/arch/openrisc/kernel/prom.c +++ b/arch/openrisc/kernel/prom.c | |||
@@ -76,14 +76,13 @@ void __init early_init_devtree(void *params) | |||
76 | of_scan_flat_dt(early_init_dt_scan_chosen, cmd_line); | 76 | of_scan_flat_dt(early_init_dt_scan_chosen, cmd_line); |
77 | 77 | ||
78 | /* Scan memory nodes and rebuild MEMBLOCKs */ | 78 | /* Scan memory nodes and rebuild MEMBLOCKs */ |
79 | memblock_init(); | ||
80 | of_scan_flat_dt(early_init_dt_scan_root, NULL); | 79 | of_scan_flat_dt(early_init_dt_scan_root, NULL); |
81 | of_scan_flat_dt(early_init_dt_scan_memory, NULL); | 80 | of_scan_flat_dt(early_init_dt_scan_memory, NULL); |
82 | 81 | ||
83 | /* Save command line for /proc/cmdline and then parse parameters */ | 82 | /* Save command line for /proc/cmdline and then parse parameters */ |
84 | strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE); | 83 | strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE); |
85 | 84 | ||
86 | memblock_analyze(); | 85 | memblock_allow_resize(); |
87 | 86 | ||
88 | /* We must copy the flattend device tree from init memory to regular | 87 | /* We must copy the flattend device tree from init memory to regular |
89 | * memory because the device tree references the strings in it | 88 | * memory because the device tree references the strings in it |