net: mvpp2: fix phylink handling of invalid PHY modes

[linux-2.6-block.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 1c3f902642809fe8a2e332bef30cdd8226c0e9ae..ee147103ba1bae45798b06ba2705a917bc5cc8d6 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -25,7 +25,7 @@
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/initrd.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
 #include <linux/acpi.h>
 #include <linux/console.h>
 #include <linux/nmi.h>
@@ -375,10 +375,11 @@ static inline void smp_prepare_cpus(unsigned int maxcpus) { }
 static void __init setup_command_line(char *command_line)
 {
        saved_command_line =
-               memblock_virt_alloc(strlen(boot_command_line) + 1, 0);
+               memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
        initcall_command_line =
-               memblock_virt_alloc(strlen(boot_command_line) + 1, 0);
-       static_command_line = memblock_virt_alloc(strlen(command_line) + 1, 0);
+               memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
+       static_command_line = memblock_alloc(strlen(command_line) + 1,
+                                            SMP_CACHE_BYTES);
        strcpy(saved_command_line, boot_command_line);
        strcpy(static_command_line, command_line);
 }
@@ -773,8 +774,10 @@ static int __init initcall_blacklist(char *str)
                str_entry = strsep(&str, ",");
                if (str_entry) {
                        pr_debug("blacklisting initcall %s\n", str_entry);
-                       entry = alloc_bootmem(sizeof(*entry));
-                       entry->buf = alloc_bootmem(strlen(str_entry) + 1);
+                       entry = memblock_alloc(sizeof(*entry),
+                                              SMP_CACHE_BYTES);
+                       entry->buf = memblock_alloc(strlen(str_entry) + 1,
+                                                   SMP_CACHE_BYTES);
                        strcpy(entry->buf, str_entry);
                        list_add(&entry->next, &blacklisted_initcalls);
                }