aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/drivers/net_kern.c2
-rw-r--r--arch/um/drivers/vector_kern.c2
-rw-r--r--arch/um/kernel/initrd.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 3ef1b48e064a..ef19a391214f 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -650,7 +650,7 @@ static int __init eth_setup(char *str)
650 return 1; 650 return 1;
651 } 651 }
652 652
653 new = alloc_bootmem(sizeof(*new)); 653 new = memblock_alloc(sizeof(*new), 0);
654 654
655 INIT_LIST_HEAD(&new->list); 655 INIT_LIST_HEAD(&new->list);
656 new->index = n; 656 new->index = n;
diff --git a/arch/um/drivers/vector_kern.c b/arch/um/drivers/vector_kern.c
index 50ee3bb5a63a..20442d20bd09 100644
--- a/arch/um/drivers/vector_kern.c
+++ b/arch/um/drivers/vector_kern.c
@@ -1580,7 +1580,7 @@ static int __init vector_setup(char *str)
1580 str, error); 1580 str, error);
1581 return 1; 1581 return 1;
1582 } 1582 }
1583 new = alloc_bootmem(sizeof(*new)); 1583 new = memblock_alloc(sizeof(*new), 0);
1584 INIT_LIST_HEAD(&new->list); 1584 INIT_LIST_HEAD(&new->list);
1585 new->unit = n; 1585 new->unit = n;
1586 new->arguments = str; 1586 new->arguments = str;
diff --git a/arch/um/kernel/initrd.c b/arch/um/kernel/initrd.c
index 6f6e7896e53f..844056cf313e 100644
--- a/arch/um/kernel/initrd.c
+++ b/arch/um/kernel/initrd.c
@@ -36,7 +36,7 @@ int __init read_initrd(void)
36 return 0; 36 return 0;
37 } 37 }
38 38
39 area = alloc_bootmem(size); 39 area = memblock_alloc(size, 0);
40 40
41 if (load_initrd(initrd, area, size) == -1) 41 if (load_initrd(initrd, area, size) == -1)
42 return 0; 42 return 0;