From: Mike Rapoport <rppt@linux•ibm.com>
To: linux-mm@kvack•org
Cc: Rich Felker <dalias@libc•org>,
linux-ia64@vger•kernel.org, devicetree@vger•kernel.org,
Catalin Marinas <catalin.marinas@arm•com>,
Heiko Carstens <heiko.carstens@de•ibm.com>,
x86@kernel•org, linux-mips@vger•kernel.org,
Max Filippov <jcmvbkbc@gmail•com>, Guo Ren <guoren@kernel•org>,
sparclinux@vger•kernel.org, Christoph Hellwig <hch@lst•de>,
linux-s390@vger•kernel.org, linux-c6x-dev@linux-c6x•org,
Yoshinori Sato <ysato@users•sourceforge.jp>,
Richard Weinberger <richard@nod•at>,
linux-sh@vger•kernel.org, Russell King <linux@armlinux•org.uk>,
kasan-dev@googlegroups•com, Mike Rapoport <rppt@linux•ibm.com>,
Geert Uytterhoeven <geert@linux-m68k•org>,
Mark Salter <msalter@redhat•com>, Dennis Zhou <dennis@kernel•org>,
Matt Turner <mattst88@gmail•com>,
linux-snps-arc@lists•infradead.org,
uclinux-h8-devel@lists•sourceforge.jp,
Petr Mladek <pmladek@suse•com>,
linux-xtensa@linux-xtensa•org, linux-alpha@vger•kernel.org,
linux-um@lists•infradead.org, linux-m68k@lists•linux-m68k.org,
Rob Herring <robh+dt@kernel•org>,
Greentime Hu <green.hu@gmail•com>,
xen-devel@lists•xenproject.org, Stafford Horne <shorne@gmail•com>,
Guan Xuetao <gxt@pku•edu.cn>,
linux-arm-kernel@lists•infradead.org,
Michal Simek <monstr@monstr•eu>, Tony Luck <tony.luck@intel•com>,
Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
linux-usb@vger•kernel.org, linux-kernel@vger•kernel.org,
Paul Burton <paul.burton@mips•com>,
Vineet Gupta <vgupta@synopsys•com>,
Andrew Morton <akpm@linux-foundation•org>,
linuxppc-dev@lists•ozlabs.org,
"David S. Miller" <davem@davemloft•net>,
openrisc@lists•librecores.org
Subject: [PATCH v2 12/21] arch: use memblock_alloc() instead of memblock_alloc_from(size, align, 0)
Date: Mon, 21 Jan 2019 10:03:59 +0200 [thread overview]
Message-ID: <1548057848-15136-13-git-send-email-rppt@linux.ibm.com> (raw)
In-Reply-To: <1548057848-15136-1-git-send-email-rppt@linux.ibm.com>
The last parameter of memblock_alloc_from() is the lower limit for the
memory allocation. When it is 0, the call is equivalent to
memblock_alloc().
Signed-off-by: Mike Rapoport <rppt@linux•ibm.com>
Acked-by: Paul Burton <paul.burton@mips•com> # MIPS part
---
arch/alpha/kernel/core_cia.c | 2 +-
arch/alpha/kernel/pci_iommu.c | 4 ++--
arch/alpha/kernel/setup.c | 2 +-
arch/ia64/kernel/mca.c | 3 +--
arch/mips/kernel/traps.c | 2 +-
arch/sparc/kernel/prom_32.c | 2 +-
arch/sparc/mm/init_32.c | 2 +-
arch/sparc/mm/srmmu.c | 10 +++++-----
8 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/arch/alpha/kernel/core_cia.c b/arch/alpha/kernel/core_cia.c
index 867e873..466cd44 100644
--- a/arch/alpha/kernel/core_cia.c
+++ b/arch/alpha/kernel/core_cia.c
@@ -331,7 +331,7 @@ cia_prepare_tbia_workaround(int window)
long i;
/* Use minimal 1K map. */
- ppte = memblock_alloc_from(CIA_BROKEN_TBIA_SIZE, 32768, 0);
+ ppte = memblock_alloc(CIA_BROKEN_TBIA_SIZE, 32768);
pte = (virt_to_phys(ppte) >> (PAGE_SHIFT - 1)) | 1;
for (i = 0; i < CIA_BROKEN_TBIA_SIZE / sizeof(unsigned long); ++i)
diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c
index aa0f50d..e4cf77b 100644
--- a/arch/alpha/kernel/pci_iommu.c
+++ b/arch/alpha/kernel/pci_iommu.c
@@ -87,13 +87,13 @@ iommu_arena_new_node(int nid, struct pci_controller *hose, dma_addr_t base,
printk("%s: couldn't allocate arena ptes from node %d\n"
" falling back to system-wide allocation\n",
__func__, nid);
- arena->ptes = memblock_alloc_from(mem_size, align, 0);
+ arena->ptes = memblock_alloc(mem_size, align);
}
#else /* CONFIG_DISCONTIGMEM */
arena = memblock_alloc(sizeof(*arena), SMP_CACHE_BYTES);
- arena->ptes = memblock_alloc_from(mem_size, align, 0);
+ arena->ptes = memblock_alloc(mem_size, align);
#endif /* CONFIG_DISCONTIGMEM */
diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c
index 4b5b1b2..5d4c76a 100644
--- a/arch/alpha/kernel/setup.c
+++ b/arch/alpha/kernel/setup.c
@@ -293,7 +293,7 @@ move_initrd(unsigned long mem_limit)
unsigned long size;
size = initrd_end - initrd_start;
- start = memblock_alloc_from(PAGE_ALIGN(size), PAGE_SIZE, 0);
+ start = memblock_alloc(PAGE_ALIGN(size), PAGE_SIZE);
if (!start || __pa(start) + size > mem_limit) {
initrd_start = initrd_end = 0;
return NULL;
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 91bd1e1..74d148b 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -1835,8 +1835,7 @@ format_mca_init_stack(void *mca_data, unsigned long offset,
/* Caller prevents this from being called after init */
static void * __ref mca_bootmem(void)
{
- return memblock_alloc_from(sizeof(struct ia64_mca_cpu),
- KERNEL_STACK_SIZE, 0);
+ return memblock_alloc(sizeof(struct ia64_mca_cpu), KERNEL_STACK_SIZE);
}
/* Do per-CPU MCA-related initialization. */
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index c91097f..2bbdee5 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -2291,7 +2291,7 @@ void __init trap_init(void)
phys_addr_t ebase_pa;
ebase = (unsigned long)
- memblock_alloc_from(size, 1 << fls(size), 0);
+ memblock_alloc(size, 1 << fls(size));
/*
* Try to ensure ebase resides in KSeg0 if possible.
diff --git a/arch/sparc/kernel/prom_32.c b/arch/sparc/kernel/prom_32.c
index 42d7f2a..38940af 100644
--- a/arch/sparc/kernel/prom_32.c
+++ b/arch/sparc/kernel/prom_32.c
@@ -32,7 +32,7 @@ void * __init prom_early_alloc(unsigned long size)
{
void *ret;
- ret = memblock_alloc_from(size, SMP_CACHE_BYTES, 0UL);
+ ret = memblock_alloc(size, SMP_CACHE_BYTES);
if (ret != NULL)
memset(ret, 0, size);
diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
index d900952..a8ff298 100644
--- a/arch/sparc/mm/init_32.c
+++ b/arch/sparc/mm/init_32.c
@@ -264,7 +264,7 @@ void __init mem_init(void)
i = last_valid_pfn >> ((20 - PAGE_SHIFT) + 5);
i += 1;
sparc_valid_addr_bitmap = (unsigned long *)
- memblock_alloc_from(i << 2, SMP_CACHE_BYTES, 0UL);
+ memblock_alloc(i << 2, SMP_CACHE_BYTES);
if (sparc_valid_addr_bitmap == NULL) {
prom_printf("mem_init: Cannot alloc valid_addr_bitmap.\n");
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
index b609362..a400ec3 100644
--- a/arch/sparc/mm/srmmu.c
+++ b/arch/sparc/mm/srmmu.c
@@ -303,13 +303,13 @@ static void __init srmmu_nocache_init(void)
bitmap_bits = srmmu_nocache_size >> SRMMU_NOCACHE_BITMAP_SHIFT;
- srmmu_nocache_pool = memblock_alloc_from(srmmu_nocache_size,
- SRMMU_NOCACHE_ALIGN_MAX, 0UL);
+ srmmu_nocache_pool = memblock_alloc(srmmu_nocache_size,
+ SRMMU_NOCACHE_ALIGN_MAX);
memset(srmmu_nocache_pool, 0, srmmu_nocache_size);
srmmu_nocache_bitmap =
- memblock_alloc_from(BITS_TO_LONGS(bitmap_bits) * sizeof(long),
- SMP_CACHE_BYTES, 0UL);
+ memblock_alloc(BITS_TO_LONGS(bitmap_bits) * sizeof(long),
+ SMP_CACHE_BYTES);
bit_map_init(&srmmu_nocache_map, srmmu_nocache_bitmap, bitmap_bits);
srmmu_swapper_pg_dir = __srmmu_get_nocache(SRMMU_PGD_TABLE_SIZE, SRMMU_PGD_TABLE_SIZE);
@@ -467,7 +467,7 @@ static void __init sparc_context_init(int numctx)
unsigned long size;
size = numctx * sizeof(struct ctx_list);
- ctx_list_pool = memblock_alloc_from(size, SMP_CACHE_BYTES, 0UL);
+ ctx_list_pool = memblock_alloc(size, SMP_CACHE_BYTES);
for (ctx = 0; ctx < numctx; ctx++) {
struct ctx_list *clist;
--
2.7.4
next prev parent reply other threads:[~2019-01-21 8:32 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-21 8:03 [PATCH v2 00/21] Refine memblock API Mike Rapoport
2019-01-21 8:03 ` [PATCH v2 01/21] openrisc: prefer memblock APIs returning virtual address Mike Rapoport
2019-01-27 3:07 ` Stafford Horne
2019-01-21 8:03 ` [PATCH v2 02/21] powerpc: use memblock functions " Mike Rapoport
2019-01-29 9:52 ` Michael Ellerman
2019-01-21 8:03 ` [PATCH v2 03/21] memblock: replace memblock_alloc_base(ANYWHERE) with memblock_phys_alloc Mike Rapoport
2019-01-21 8:03 ` [PATCH v2 04/21] memblock: drop memblock_alloc_base_nid() Mike Rapoport
2019-01-21 8:03 ` [PATCH v2 05/21] memblock: emphasize that memblock_alloc_range() returns a physical address Mike Rapoport
2019-01-21 8:03 ` [PATCH v2 06/21] memblock: memblock_phys_alloc_try_nid(): don't panic Mike Rapoport
2019-01-25 17:45 ` Catalin Marinas
2019-01-25 19:32 ` Mike Rapoport
2019-01-29 9:56 ` Michael Ellerman
2019-01-29 9:58 ` Michael Ellerman
2019-01-21 8:03 ` [PATCH v2 07/21] memblock: memblock_phys_alloc(): " Mike Rapoport
2019-01-21 8:03 ` [PATCH v2 08/21] memblock: drop __memblock_alloc_base() Mike Rapoport
2019-01-21 8:03 ` [PATCH v2 09/21] memblock: drop memblock_alloc_base() Mike Rapoport
2019-01-29 10:29 ` Michael Ellerman
2019-01-21 8:03 ` [PATCH v2 10/21] memblock: refactor internal allocation functions Mike Rapoport
2019-02-03 9:39 ` Michael Ellerman
2019-02-03 10:04 ` Mike Rapoport
2019-02-03 11:39 ` Mike Rapoport
2019-02-04 8:45 ` Michael Ellerman
2019-02-04 23:08 ` Stephen Rothwell
2019-01-21 8:03 ` [PATCH v2 11/21] memblock: make memblock_find_in_range_node() and choose_memblock_flags() static Mike Rapoport
2019-01-21 8:03 ` Mike Rapoport [this message]
2019-01-21 8:04 ` [PATCH v2 13/21] arch: don't memset(0) memory returned by memblock_alloc() Mike Rapoport
2019-01-21 8:04 ` [PATCH v2 14/21] ia64: add checks for the return value of memblock_alloc*() Mike Rapoport
2019-01-21 8:04 ` [PATCH v2 15/21] sparc: " Mike Rapoport
2019-01-21 8:04 ` [PATCH v2 16/21] mm/percpu: " Mike Rapoport
2019-01-21 8:04 ` [PATCH v2 17/21] init/main: " Mike Rapoport
2019-01-21 8:04 ` [PATCH v2 18/21] swiotlb: " Mike Rapoport
2019-01-21 8:04 ` [PATCH v2 19/21] treewide: " Mike Rapoport
2019-01-21 8:39 ` Geert Uytterhoeven
2019-01-21 17:18 ` Rob Herring
2019-01-31 6:07 ` Christophe Leroy
2019-01-31 6:41 ` Mike Rapoport
2019-01-31 6:44 ` Christophe Leroy
2019-01-31 7:07 ` Christophe Leroy
2019-01-31 7:14 ` Mike Rapoport
2019-01-31 15:23 ` Max Filippov
2019-01-21 8:04 ` [PATCH v2 20/21] memblock: memblock_alloc_try_nid: don't panic Mike Rapoport
2019-01-21 8:04 ` [PATCH v2 21/21] memblock: drop memblock_alloc_*_nopanic() variants Mike Rapoport
2019-01-30 13:38 ` Petr Mladek
2019-09-24 17:52 ` [PATCH v2 00/21] Refine memblock API Adam Ford
2019-09-25 12:12 ` Fabio Estevam
2019-09-25 12:17 ` Adam Ford
2019-09-25 15:17 ` Fabio Estevam
2019-09-26 13:09 ` Adam Ford
2019-09-26 16:04 ` Mike Rapoport
2019-09-26 19:35 ` Adam Ford
2019-09-28 7:33 ` Mike Rapoport
2019-09-29 13:33 ` Adam Ford
2019-10-02 0:14 ` Adam Ford
2019-10-02 7:36 ` Mike Rapoport
2019-10-02 11:14 ` Adam Ford
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1548057848-15136-13-git-send-email-rppt@linux.ibm.com \
--to=rppt@linux$(echo .)ibm.com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=catalin.marinas@arm$(echo .)com \
--cc=dalias@libc$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=dennis@kernel$(echo .)org \
--cc=devicetree@vger$(echo .)kernel.org \
--cc=geert@linux-m68k$(echo .)org \
--cc=green.hu@gmail$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=guoren@kernel$(echo .)org \
--cc=gxt@pku$(echo .)edu.cn \
--cc=hch@lst$(echo .)de \
--cc=heiko.carstens@de$(echo .)ibm.com \
--cc=jcmvbkbc@gmail$(echo .)com \
--cc=kasan-dev@googlegroups$(echo .)com \
--cc=linux-alpha@vger$(echo .)kernel.org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-c6x-dev@linux-c6x$(echo .)org \
--cc=linux-ia64@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-m68k@lists$(echo .)linux-m68k.org \
--cc=linux-mips@vger$(echo .)kernel.org \
--cc=linux-mm@kvack$(echo .)org \
--cc=linux-s390@vger$(echo .)kernel.org \
--cc=linux-sh@vger$(echo .)kernel.org \
--cc=linux-snps-arc@lists$(echo .)infradead.org \
--cc=linux-um@lists$(echo .)infradead.org \
--cc=linux-usb@vger$(echo .)kernel.org \
--cc=linux-xtensa@linux-xtensa$(echo .)org \
--cc=linux@armlinux$(echo .)org.uk \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mattst88@gmail$(echo .)com \
--cc=monstr@monstr$(echo .)eu \
--cc=msalter@redhat$(echo .)com \
--cc=openrisc@lists$(echo .)librecores.org \
--cc=paul.burton@mips$(echo .)com \
--cc=pmladek@suse$(echo .)com \
--cc=richard@nod$(echo .)at \
--cc=robh+dt@kernel$(echo .)org \
--cc=shorne@gmail$(echo .)com \
--cc=sparclinux@vger$(echo .)kernel.org \
--cc=tony.luck@intel$(echo .)com \
--cc=uclinux-h8-devel@lists$(echo .)sourceforge.jp \
--cc=vgupta@synopsys$(echo .)com \
--cc=x86@kernel$(echo .)org \
--cc=xen-devel@lists$(echo .)xenproject.org \
--cc=ysato@users$(echo .)sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox