diff options
Diffstat (limited to 'init/main.c')
-rw-r--r-- | init/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c index 86b59cf3bec7..8cef69c61389 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -773,8 +773,8 @@ static int __init initcall_blacklist(char *str) | |||
773 | str_entry = strsep(&str, ","); | 773 | str_entry = strsep(&str, ","); |
774 | if (str_entry) { | 774 | if (str_entry) { |
775 | pr_debug("blacklisting initcall %s\n", str_entry); | 775 | pr_debug("blacklisting initcall %s\n", str_entry); |
776 | entry = alloc_bootmem(sizeof(*entry)); | 776 | entry = memblock_alloc(sizeof(*entry), 0); |
777 | entry->buf = alloc_bootmem(strlen(str_entry) + 1); | 777 | entry->buf = memblock_alloc(strlen(str_entry) + 1, 0); |
778 | strcpy(entry->buf, str_entry); | 778 | strcpy(entry->buf, str_entry); |
779 | list_add(&entry->next, &blacklisted_initcalls); | 779 | list_add(&entry->next, &blacklisted_initcalls); |
780 | } | 780 | } |