Skip to content

Commit eb31d55

Browse files
rppttorvalds
rppt
authored and
torvalds
committed
memblock: remove _virt from APIs returning virtual address
The conversion is done using sed -i 's@memblock_virt_alloc@memblock_alloc@g' \ $(git grep -l memblock_virt_alloc) Link: http://lkml.kernel.org/r/1536927045-23536-8-git-send-email-rppt@linux.vnet.ibm.com Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Chris Zankel <chris@zankel.net> Cc: "David S. Miller" <davem@davemloft.net> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Greentime Hu <green.hu@gmail.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Guan Xuetao <gxt@pku.edu.cn> Cc: Ingo Molnar <mingo@redhat.com> Cc: "James E.J. Bottomley" <jejb@parisc-linux.org> Cc: Jonas Bonn <jonas@southpole.se> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Ley Foon Tan <lftan@altera.com> Cc: Mark Salter <msalter@redhat.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Matt Turner <mattst88@gmail.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Michal Hocko <mhocko@suse.com> Cc: Michal Simek <monstr@monstr.eu> Cc: Palmer Dabbelt <palmer@sifive.com> Cc: Paul Burton <paul.burton@mips.com> Cc: Richard Kuo <rkuo@codeaurora.org> Cc: Richard Weinberger <richard@nod.at> Cc: Rich Felker <dalias@libc.org> Cc: Russell King <linux@armlinux.org.uk> Cc: Serge Semin <fancer.lancer@gmail.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tony Luck <tony.luck@intel.com> Cc: Vineet Gupta <vgupta@synopsys.com> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 9a8dd70 commit eb31d55

File tree

37 files changed

+105
-105
lines changed

37 files changed

+105
-105
lines changed

‎arch/arm/kernel/setup.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -857,15 +857,15 @@ static void __init request_standard_resources(const struct machine_desc *mdesc)
857857
*/
858858
boot_alias_start = phys_to_idmap(start);
859859
if (arm_has_idmap_alias() && boot_alias_start != IDMAP_INVALID_ADDR) {
860-
res = memblock_virt_alloc(sizeof(*res), 0);
860+
res = memblock_alloc(sizeof(*res), 0);
861861
res->name = "System RAM (boot alias)";
862862
res->start = boot_alias_start;
863863
res->end = phys_to_idmap(end);
864864
res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
865865
request_resource(&iomem_resource, res);
866866
}
867867

868-
res = memblock_virt_alloc(sizeof(*res), 0);
868+
res = memblock_alloc(sizeof(*res), 0);
869869
res->name = "System RAM";
870870
res->start = start;
871871
res->end = end;

‎arch/arm/mach-omap2/omap_hwmod.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ static int __init _setup_clkctrl_provider(struct device_node *np)
726726
u64 size;
727727
int i;
728728

729-
provider = memblock_virt_alloc(sizeof(*provider), 0);
729+
provider = memblock_alloc(sizeof(*provider), 0);
730730
if (!provider)
731731
return -ENOMEM;
732732

@@ -736,12 +736,12 @@ static int __init _setup_clkctrl_provider(struct device_node *np)
736736
of_property_count_elems_of_size(np, "reg", sizeof(u32)) / 2;
737737

738738
provider->addr =
739-
memblock_virt_alloc(sizeof(void *) * provider->num_addrs, 0);
739+
memblock_alloc(sizeof(void *) * provider->num_addrs, 0);
740740
if (!provider->addr)
741741
return -ENOMEM;
742742

743743
provider->size =
744-
memblock_virt_alloc(sizeof(u32) * provider->num_addrs, 0);
744+
memblock_alloc(sizeof(u32) * provider->num_addrs, 0);
745745
if (!provider->size)
746746
return -ENOMEM;
747747

‎arch/arm64/mm/kasan_init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ static pgd_t tmp_pg_dir[PTRS_PER_PGD] __initdata __aligned(PGD_SIZE);
3838

3939
static phys_addr_t __init kasan_alloc_zeroed_page(int node)
4040
{
41-
void *p = memblock_virt_alloc_try_nid(PAGE_SIZE, PAGE_SIZE,
41+
void *p = memblock_alloc_try_nid(PAGE_SIZE, PAGE_SIZE,
4242
__pa(MAX_DMA_ADDRESS),
4343
MEMBLOCK_ALLOC_ACCESSIBLE, node);
4444
return __pa(p);

‎arch/arm64/mm/numa.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size,
168168
{
169169
int nid = early_cpu_to_node(cpu);
170170

171-
return memblock_virt_alloc_try_nid(size, align,
171+
return memblock_alloc_try_nid(size, align,
172172
__pa(MAX_DMA_ADDRESS), MEMBLOCK_ALLOC_ACCESSIBLE, nid);
173173
}
174174

‎arch/mips/kernel/setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -859,7 +859,7 @@ static void __init arch_mem_init(char **cmdline_p)
859859
* Prevent memblock from allocating high memory.
860860
* This cannot be done before max_low_pfn is detected, so up
861861
* to this point is possible to only reserve physical memory
862-
* with memblock_reserve; memblock_virt_alloc* can be used
862+
* with memblock_reserve; memblock_alloc* can be used
863863
* only after this point
864864
*/
865865
memblock_set_current_limit(PFN_PHYS(max_low_pfn));

‎arch/powerpc/kernel/pci_32.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ pci_create_OF_bus_map(void)
203203
struct property* of_prop;
204204
struct device_node *dn;
205205

206-
of_prop = memblock_virt_alloc(sizeof(struct property) + 256, 0);
206+
of_prop = memblock_alloc(sizeof(struct property) + 256, 0);
207207
dn = of_find_node_by_path("/");
208208
if (dn) {
209209
memset(of_prop, -1, sizeof(struct property) + 256);

‎arch/powerpc/lib/alloc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ void * __ref zalloc_maybe_bootmem(size_t size, gfp_t mask)
1414
if (slab_is_available())
1515
p = kzalloc(size, mask);
1616
else {
17-
p = memblock_virt_alloc(size, 0);
17+
p = memblock_alloc(size, 0);
1818
}
1919
return p;
2020
}

‎arch/powerpc/mm/mmu_context_nohash.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -461,10 +461,10 @@ void __init mmu_context_init(void)
461461
/*
462462
* Allocate the maps used by context management
463463
*/
464-
context_map = memblock_virt_alloc(CTX_MAP_SIZE, 0);
465-
context_mm = memblock_virt_alloc(sizeof(void *) * (LAST_CONTEXT + 1), 0);
464+
context_map = memblock_alloc(CTX_MAP_SIZE, 0);
465+
context_mm = memblock_alloc(sizeof(void *) * (LAST_CONTEXT + 1), 0);
466466
#ifdef CONFIG_SMP
467-
stale_map[boot_cpuid] = memblock_virt_alloc(CTX_MAP_SIZE, 0);
467+
stale_map[boot_cpuid] = memblock_alloc(CTX_MAP_SIZE, 0);
468468

469469
cpuhp_setup_state_nocalls(CPUHP_POWERPC_MMU_CTX_PREPARE,
470470
"powerpc/mmu/ctx:prepare",

‎arch/powerpc/platforms/powermac/nvram.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ static int __init core99_nvram_setup(struct device_node *dp, unsigned long addr)
513513
printk(KERN_ERR "nvram: no address\n");
514514
return -EINVAL;
515515
}
516-
nvram_image = memblock_virt_alloc(NVRAM_SIZE, 0);
516+
nvram_image = memblock_alloc(NVRAM_SIZE, 0);
517517
nvram_data = ioremap(addr, NVRAM_SIZE*2);
518518
nvram_naddrs = 1; /* Make sure we get the correct case */
519519

‎arch/powerpc/platforms/powernv/pci-ioda.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3770,7 +3770,7 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np,
37703770
phb_id = be64_to_cpup(prop64);
37713771
pr_debug(" PHB-ID : 0x%016llx\n", phb_id);
37723772

3773-
phb = memblock_virt_alloc(sizeof(*phb), 0);
3773+
phb = memblock_alloc(sizeof(*phb), 0);
37743774

37753775
/* Allocate PCI controller */
37763776
phb->hose = hose = pcibios_alloc_controller(np);
@@ -3816,7 +3816,7 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np,
38163816
else
38173817
phb->diag_data_size = PNV_PCI_DIAG_BUF_SIZE;
38183818

3819-
phb->diag_data = memblock_virt_alloc(phb->diag_data_size, 0);
3819+
phb->diag_data = memblock_alloc(phb->diag_data_size, 0);
38203820

38213821
/* Parse 32-bit and IO ranges (if any) */
38223822
pci_process_bridge_OF_ranges(hose, np, !hose->global_number);
@@ -3875,7 +3875,7 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np,
38753875
}
38763876
pemap_off = size;
38773877
size += phb->ioda.total_pe_num * sizeof(struct pnv_ioda_pe);
3878-
aux = memblock_virt_alloc(size, 0);
3878+
aux = memblock_alloc(size, 0);
38793879
phb->ioda.pe_alloc = aux;
38803880
phb->ioda.m64_segmap = aux + m64map_off;
38813881
phb->ioda.m32_segmap = aux + m32map_off;

‎arch/powerpc/platforms/ps3/setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ static void __init prealloc(struct ps3_prealloc *p)
126126
if (!p->size)
127127
return;
128128

129-
p->address = memblock_virt_alloc(p->size, p->align);
129+
p->address = memblock_alloc(p->size, p->align);
130130

131131
printk(KERN_INFO "%s: %lu bytes at %p\n", p->name, p->size,
132132
p->address);

‎arch/powerpc/sysdev/msi_bitmap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ int __ref msi_bitmap_alloc(struct msi_bitmap *bmp, unsigned int irq_count,
128128
if (bmp->bitmap_from_slab)
129129
bmp->bitmap = kzalloc(size, GFP_KERNEL);
130130
else {
131-
bmp->bitmap = memblock_virt_alloc(size, 0);
131+
bmp->bitmap = memblock_alloc(size, 0);
132132
/* the bitmap won't be freed from memblock allocator */
133133
kmemleak_not_leak(bmp->bitmap);
134134
}

‎arch/s390/kernel/setup.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ static void __init setup_lowcore(void)
378378
* Setup lowcore for boot cpu
379379
*/
380380
BUILD_BUG_ON(sizeof(struct lowcore) != LC_PAGES * PAGE_SIZE);
381-
lc = memblock_virt_alloc_low(sizeof(*lc), sizeof(*lc));
381+
lc = memblock_alloc_low(sizeof(*lc), sizeof(*lc));
382382
lc->restart_psw.mask = PSW_KERNEL_BITS;
383383
lc->restart_psw.addr = (unsigned long) restart_int_handler;
384384
lc->external_new_psw.mask = PSW_KERNEL_BITS |
@@ -422,7 +422,7 @@ static void __init setup_lowcore(void)
422422
* Allocate the global restart stack which is the same for
423423
* all CPUs in cast *one* of them does a PSW restart.
424424
*/
425-
restart_stack = memblock_virt_alloc(THREAD_SIZE, THREAD_SIZE);
425+
restart_stack = memblock_alloc(THREAD_SIZE, THREAD_SIZE);
426426
restart_stack += STACK_INIT_OFFSET;
427427

428428
/*
@@ -488,7 +488,7 @@ static void __init setup_resources(void)
488488
bss_resource.end = (unsigned long) __bss_stop - 1;
489489

490490
for_each_memblock(memory, reg) {
491-
res = memblock_virt_alloc(sizeof(*res), 8);
491+
res = memblock_alloc(sizeof(*res), 8);
492492
res->flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM;
493493

494494
res->name = "System RAM";
@@ -502,7 +502,7 @@ static void __init setup_resources(void)
502502
std_res->start > res->end)
503503
continue;
504504
if (std_res->end > res->end) {
505-
sub_res = memblock_virt_alloc(sizeof(*sub_res), 8);
505+
sub_res = memblock_alloc(sizeof(*sub_res), 8);
506506
*sub_res = *std_res;
507507
sub_res->end = res->end;
508508
std_res->start = res->end + 1;

‎arch/s390/kernel/smp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@ void __init smp_detect_cpus(void)
761761
u16 address;
762762

763763
/* Get CPU information */
764-
info = memblock_virt_alloc(sizeof(*info), 8);
764+
info = memblock_alloc(sizeof(*info), 8);
765765
smp_get_core_info(info, 1);
766766
/* Find boot CPU type */
767767
if (sclp.has_core_type) {

‎arch/s390/kernel/topology.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ static void __init alloc_masks(struct sysinfo_15_1_x *info,
519519
nr_masks *= info->mag[TOPOLOGY_NR_MAG - offset - 1 - i];
520520
nr_masks = max(nr_masks, 1);
521521
for (i = 0; i < nr_masks; i++) {
522-
mask->next = memblock_virt_alloc(sizeof(*mask->next), 8);
522+
mask->next = memblock_alloc(sizeof(*mask->next), 8);
523523
mask = mask->next;
524524
}
525525
}
@@ -537,7 +537,7 @@ void __init topology_init_early(void)
537537
}
538538
if (!MACHINE_HAS_TOPOLOGY)
539539
goto out;
540-
tl_info = memblock_virt_alloc(PAGE_SIZE, PAGE_SIZE);
540+
tl_info = memblock_alloc(PAGE_SIZE, PAGE_SIZE);
541541
info = tl_info;
542542
store_topology(info);
543543
pr_info("The CPU configuration topology of the machine is: %d %d %d %d %d %d / %d\n",

‎arch/s390/numa/mode_emu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ static void __ref create_core_to_node_map(void)
313313
{
314314
int i;
315315

316-
emu_cores = memblock_virt_alloc(sizeof(*emu_cores), 8);
316+
emu_cores = memblock_alloc(sizeof(*emu_cores), 8);
317317
for (i = 0; i < ARRAY_SIZE(emu_cores->to_node_id); i++)
318318
emu_cores->to_node_id[i] = NODE_ID_FREE;
319319
}

‎arch/s390/numa/toptree.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ struct toptree __ref *toptree_alloc(int level, int id)
3434
if (slab_is_available())
3535
res = kzalloc(sizeof(*res), GFP_KERNEL);
3636
else
37-
res = memblock_virt_alloc(sizeof(*res), 8);
37+
res = memblock_alloc(sizeof(*res), 8);
3838
if (!res)
3939
return res;
4040

‎arch/x86/mm/kasan_init_64.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ static p4d_t tmp_p4d_table[MAX_PTRS_PER_P4D] __initdata __aligned(PAGE_SIZE);
2828
static __init void *early_alloc(size_t size, int nid, bool panic)
2929
{
3030
if (panic)
31-
return memblock_virt_alloc_try_nid(size, size,
31+
return memblock_alloc_try_nid(size, size,
3232
__pa(MAX_DMA_ADDRESS), BOOTMEM_ALLOC_ACCESSIBLE, nid);
3333
else
34-
return memblock_virt_alloc_try_nid_nopanic(size, size,
34+
return memblock_alloc_try_nid_nopanic(size, size,
3535
__pa(MAX_DMA_ADDRESS), BOOTMEM_ALLOC_ACCESSIBLE, nid);
3636
}
3737

‎arch/xtensa/mm/kasan_init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ static void __init populate(void *start, void *end)
4343
unsigned long vaddr = (unsigned long)start;
4444
pgd_t *pgd = pgd_offset_k(vaddr);
4545
pmd_t *pmd = pmd_offset(pgd, vaddr);
46-
pte_t *pte = memblock_virt_alloc(n_pages * sizeof(pte_t), PAGE_SIZE);
46+
pte_t *pte = memblock_alloc(n_pages * sizeof(pte_t), PAGE_SIZE);
4747

4848
pr_debug("%s: %p - %p\n", __func__, start, end);
4949

‎drivers/clk/ti/clk.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ void __init omap2_clk_legacy_provider_init(int index, void __iomem *mem)
342342
{
343343
struct clk_iomap *io;
344344

345-
io = memblock_virt_alloc(sizeof(*io), 0);
345+
io = memblock_alloc(sizeof(*io), 0);
346346

347347
io->mem = mem;
348348

‎drivers/firmware/memmap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ int __init firmware_map_add_early(u64 start, u64 end, const char *type)
333333
{
334334
struct firmware_map_entry *entry;
335335

336-
entry = memblock_virt_alloc(sizeof(struct firmware_map_entry), 0);
336+
entry = memblock_alloc(sizeof(struct firmware_map_entry), 0);
337337
if (WARN_ON(!entry))
338338
return -ENOMEM;
339339

‎drivers/of/fdt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1179,7 +1179,7 @@ int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base,
11791179

11801180
static void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
11811181
{
1182-
return memblock_virt_alloc(size, align);
1182+
return memblock_alloc(size, align);
11831183
}
11841184

11851185
bool __init early_init_dt_verify(void *params)

‎drivers/of/unittest.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2192,7 +2192,7 @@ static struct device_node *overlay_base_root;
21922192

21932193
static void * __init dt_alloc_memory(u64 size, u64 align)
21942194
{
2195-
return memblock_virt_alloc(size, align);
2195+
return memblock_alloc(size, align);
21962196
}
21972197

21982198
/*

‎include/linux/bootmem.h

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -95,78 +95,78 @@ extern void *__alloc_bootmem_low(unsigned long size,
9595
#define BOOTMEM_ALLOC_ANYWHERE (~(phys_addr_t)0)
9696

9797
/* FIXME: Move to memblock.h at a point where we remove nobootmem.c */
98-
void *memblock_virt_alloc_try_nid_raw(phys_addr_t size, phys_addr_t align,
98+
void *memblock_alloc_try_nid_raw(phys_addr_t size, phys_addr_t align,
9999
phys_addr_t min_addr,
100100
phys_addr_t max_addr, int nid);
101-
void *memblock_virt_alloc_try_nid_nopanic(phys_addr_t size,
101+
void *memblock_alloc_try_nid_nopanic(phys_addr_t size,
102102
phys_addr_t align, phys_addr_t min_addr,
103103
phys_addr_t max_addr, int nid);
104-
void *memblock_virt_alloc_try_nid(phys_addr_t size, phys_addr_t align,
104+
void *memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align,
105105
phys_addr_t min_addr, phys_addr_t max_addr, int nid);
106106
void __memblock_free_early(phys_addr_t base, phys_addr_t size);
107107
void __memblock_free_late(phys_addr_t base, phys_addr_t size);
108108

109-
static inline void * __init memblock_virt_alloc(
109+
static inline void * __init memblock_alloc(
110110
phys_addr_t size, phys_addr_t align)
111111
{
112-
return memblock_virt_alloc_try_nid(size, align, BOOTMEM_LOW_LIMIT,
112+
return memblock_alloc_try_nid(size, align, BOOTMEM_LOW_LIMIT,
113113
BOOTMEM_ALLOC_ACCESSIBLE,
114114
NUMA_NO_NODE);
115115
}
116116

117-
static inline void * __init memblock_virt_alloc_raw(
117+
static inline void * __init memblock_alloc_raw(
118118
phys_addr_t size, phys_addr_t align)
119119
{
120-
return memblock_virt_alloc_try_nid_raw(size, align, BOOTMEM_LOW_LIMIT,
120+
return memblock_alloc_try_nid_raw(size, align, BOOTMEM_LOW_LIMIT,
121121
BOOTMEM_ALLOC_ACCESSIBLE,
122122
NUMA_NO_NODE);
123123
}
124124

125-
static inline void * __init memblock_virt_alloc_nopanic(
125+
static inline void * __init memblock_alloc_nopanic(
126126
phys_addr_t size, phys_addr_t align)
127127
{
128-
return memblock_virt_alloc_try_nid_nopanic(size, align,
128+
return memblock_alloc_try_nid_nopanic(size, align,
129129
BOOTMEM_LOW_LIMIT,
130130
BOOTMEM_ALLOC_ACCESSIBLE,
131131
NUMA_NO_NODE);
132132
}
133133

134-
static inline void * __init memblock_virt_alloc_low(
134+
static inline void * __init memblock_alloc_low(
135135
phys_addr_t size, phys_addr_t align)
136136
{
137-
return memblock_virt_alloc_try_nid(size, align,
137+
return memblock_alloc_try_nid(size, align,
138138
BOOTMEM_LOW_LIMIT,
139139
ARCH_LOW_ADDRESS_LIMIT,
140140
NUMA_NO_NODE);
141141
}
142-
static inline void * __init memblock_virt_alloc_low_nopanic(
142+
static inline void * __init memblock_alloc_low_nopanic(
143143
phys_addr_t size, phys_addr_t align)
144144
{
145-
return memblock_virt_alloc_try_nid_nopanic(size, align,
145+
return memblock_alloc_try_nid_nopanic(size, align,
146146
BOOTMEM_LOW_LIMIT,
147147
ARCH_LOW_ADDRESS_LIMIT,
148148
NUMA_NO_NODE);
149149
}
150150

151-
static inline void * __init memblock_virt_alloc_from_nopanic(
151+
static inline void * __init memblock_alloc_from_nopanic(
152152
phys_addr_t size, phys_addr_t align, phys_addr_t min_addr)
153153
{
154-
return memblock_virt_alloc_try_nid_nopanic(size, align, min_addr,
154+
return memblock_alloc_try_nid_nopanic(size, align, min_addr,
155155
BOOTMEM_ALLOC_ACCESSIBLE,
156156
NUMA_NO_NODE);
157157
}
158158

159-
static inline void * __init memblock_virt_alloc_node(
159+
static inline void * __init memblock_alloc_node(
160160
phys_addr_t size, int nid)
161161
{
162-
return memblock_virt_alloc_try_nid(size, 0, BOOTMEM_LOW_LIMIT,
162+
return memblock_alloc_try_nid(size, 0, BOOTMEM_LOW_LIMIT,
163163
BOOTMEM_ALLOC_ACCESSIBLE, nid);
164164
}
165165

166-
static inline void * __init memblock_virt_alloc_node_nopanic(
166+
static inline void * __init memblock_alloc_node_nopanic(
167167
phys_addr_t size, int nid)
168168
{
169-
return memblock_virt_alloc_try_nid_nopanic(size, 0, BOOTMEM_LOW_LIMIT,
169+
return memblock_alloc_try_nid_nopanic(size, 0, BOOTMEM_LOW_LIMIT,
170170
BOOTMEM_ALLOC_ACCESSIBLE,
171171
nid);
172172
}

0 commit comments

Comments
 (0)