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>,
Michael Ellerman <mpe@ellerman.id.au>,
Andrew Morton <akpm@linux-foundation.org>,
linuxppc-dev@lists.ozlabs.org,
"David S. Miller" <davem@davemloft.net>,
openrisc@lists.librecores.org
Subject: [PATCH 03/21] memblock: replace memblock_alloc_base(ANYWHERE) with memblock_phys_alloc
Date: Wed, 16 Jan 2019 15:44:03 +0200 [thread overview]
Message-ID: <1547646261-32535-4-git-send-email-rppt@linux.ibm.com> (raw)
In-Reply-To: <1547646261-32535-1-git-send-email-rppt@linux.ibm.com>
The calls to memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ANYWHERE) and
memblock_phys_alloc(size, align) are equivalent as both try to allocate
'size' bytes with 'align' alignment anywhere in the memory and panic if hte
allocation fails.
The conversion is done using the following semantic patch:
@@
expression size, align;
@@
- memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ANYWHERE)
+ memblock_phys_alloc(size, align)
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
arch/arm/mm/init.c | 2 +-
arch/sh/boards/mach-ap325rxa/setup.c | 2 +-
arch/sh/boards/mach-ecovec24/setup.c | 4 ++--
arch/sh/boards/mach-kfr2r09/setup.c | 2 +-
arch/sh/boards/mach-migor/setup.c | 2 +-
arch/sh/boards/mach-se/7724/setup.c | 4 ++--
arch/xtensa/mm/kasan_init.c | 3 +--
7 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 478ea8b..b76b90e 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -205,7 +205,7 @@ phys_addr_t __init arm_memblock_steal(phys_addr_t size, phys_addr_t align)
BUG_ON(!arm_memblock_steal_permitted);
- phys = memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ANYWHERE);
+ phys = memblock_phys_alloc(size, align);
memblock_free(phys, size);
memblock_remove(phys, size);
diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c
index 8f234d04..d7ceab6 100644
--- a/arch/sh/boards/mach-ap325rxa/setup.c
+++ b/arch/sh/boards/mach-ap325rxa/setup.c
@@ -557,7 +557,7 @@ static void __init ap325rxa_mv_mem_reserve(void)
phys_addr_t phys;
phys_addr_t size = CEU_BUFFER_MEMORY_SIZE;
- phys = memblock_alloc_base(size, PAGE_SIZE, MEMBLOCK_ALLOC_ANYWHERE);
+ phys = memblock_phys_alloc(size, PAGE_SIZE);
memblock_free(phys, size);
memblock_remove(phys, size);
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 22b4106..a3901806 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -1480,12 +1480,12 @@ static void __init ecovec_mv_mem_reserve(void)
phys_addr_t phys;
phys_addr_t size = CEU_BUFFER_MEMORY_SIZE;
- phys = memblock_alloc_base(size, PAGE_SIZE, MEMBLOCK_ALLOC_ANYWHERE);
+ phys = memblock_phys_alloc(size, PAGE_SIZE);
memblock_free(phys, size);
memblock_remove(phys, size);
ceu0_dma_membase = phys;
- phys = memblock_alloc_base(size, PAGE_SIZE, MEMBLOCK_ALLOC_ANYWHERE);
+ phys = memblock_phys_alloc(size, PAGE_SIZE);
memblock_free(phys, size);
memblock_remove(phys, size);
ceu1_dma_membase = phys;
diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c
index 203d249..55bdf4a 100644
--- a/arch/sh/boards/mach-kfr2r09/setup.c
+++ b/arch/sh/boards/mach-kfr2r09/setup.c
@@ -631,7 +631,7 @@ static void __init kfr2r09_mv_mem_reserve(void)
phys_addr_t phys;
phys_addr_t size = CEU_BUFFER_MEMORY_SIZE;
- phys = memblock_alloc_base(size, PAGE_SIZE, MEMBLOCK_ALLOC_ANYWHERE);
+ phys = memblock_phys_alloc(size, PAGE_SIZE);
memblock_free(phys, size);
memblock_remove(phys, size);
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index f4ad33c..ba7eee6 100644
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -630,7 +630,7 @@ static void __init migor_mv_mem_reserve(void)
phys_addr_t phys;
phys_addr_t size = CEU_BUFFER_MEMORY_SIZE;
- phys = memblock_alloc_base(size, PAGE_SIZE, MEMBLOCK_ALLOC_ANYWHERE);
+ phys = memblock_phys_alloc(size, PAGE_SIZE);
memblock_free(phys, size);
memblock_remove(phys, size);
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index fdbec22a..4696e10 100644
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -965,12 +965,12 @@ static void __init ms7724se_mv_mem_reserve(void)
phys_addr_t phys;
phys_addr_t size = CEU_BUFFER_MEMORY_SIZE;
- phys = memblock_alloc_base(size, PAGE_SIZE, MEMBLOCK_ALLOC_ANYWHERE);
+ phys = memblock_phys_alloc(size, PAGE_SIZE);
memblock_free(phys, size);
memblock_remove(phys, size);
ceu0_dma_membase = phys;
- phys = memblock_alloc_base(size, PAGE_SIZE, MEMBLOCK_ALLOC_ANYWHERE);
+ phys = memblock_phys_alloc(size, PAGE_SIZE);
memblock_free(phys, size);
memblock_remove(phys, size);
ceu1_dma_membase = phys;
diff --git a/arch/xtensa/mm/kasan_init.c b/arch/xtensa/mm/kasan_init.c
index 1734cda..48dbb03 100644
--- a/arch/xtensa/mm/kasan_init.c
+++ b/arch/xtensa/mm/kasan_init.c
@@ -52,8 +52,7 @@ static void __init populate(void *start, void *end)
for (k = 0; k < PTRS_PER_PTE; ++k, ++j) {
phys_addr_t phys =
- memblock_alloc_base(PAGE_SIZE, PAGE_SIZE,
- MEMBLOCK_ALLOC_ANYWHERE);
+ memblock_phys_alloc(PAGE_SIZE, PAGE_SIZE);
set_pte(pte + j, pfn_pte(PHYS_PFN(phys), PAGE_KERNEL));
}
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-01-16 13:45 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-16 13:44 [PATCH 00/21] Refine memblock API Mike Rapoport
2019-01-16 13:44 ` [PATCH 01/21] openrisc: prefer memblock APIs returning virtual address Mike Rapoport
2019-01-16 13:44 ` Mike Rapoport [this message]
2019-01-16 13:44 ` [PATCH 04/21] memblock: drop memblock_alloc_base_nid() Mike Rapoport
2019-01-16 13:44 ` [PATCH 05/21] memblock: emphasize that memblock_alloc_range() returns a physical address Mike Rapoport
2019-01-16 13:44 ` [PATCH 06/21] memblock: memblock_phys_alloc_try_nid(): don't panic Mike Rapoport
2019-01-16 13:44 ` [PATCH 07/21] memblock: memblock_phys_alloc(): " Mike Rapoport
2019-01-16 13:44 ` [PATCH 08/21] memblock: drop __memblock_alloc_base() Mike Rapoport
2019-01-16 15:15 ` Rob Herring
2019-01-16 13:44 ` [PATCH 09/21] memblock: drop memblock_alloc_base() Mike Rapoport
2019-01-16 13:44 ` [PATCH 10/21] memblock: refactor internal allocation functions Mike Rapoport
2019-01-16 13:44 ` [PATCH 11/21] memblock: make memblock_find_in_range_node() and choose_memblock_flags() static Mike Rapoport
2019-01-16 13:44 ` [PATCH 12/21] arch: use memblock_alloc() instead of memblock_alloc_from(size, align, 0) Mike Rapoport
2019-01-18 17:53 ` Paul Burton
2019-01-16 13:44 ` [PATCH 13/21] arch: don't memset(0) memory returned by memblock_alloc() Mike Rapoport
2019-01-16 14:17 ` Geert Uytterhoeven
2019-01-16 13:44 ` [PATCH 14/21] ia64: add checks for the return value of memblock_alloc*() Mike Rapoport
2019-01-16 13:44 ` [PATCH 15/21] sparc: " Mike Rapoport
2019-01-16 17:21 ` David Miller
2019-01-16 13:44 ` [PATCH 16/21] mm/percpu: " Mike Rapoport
2019-01-16 13:44 ` [PATCH 17/21] init/main: " Mike Rapoport
2019-01-16 13:44 ` [PATCH 18/21] swiotlb: " Mike Rapoport
2019-01-16 13:44 ` [PATCH 19/21] treewide: " Mike Rapoport
2019-01-16 14:27 ` Geert Uytterhoeven
2019-01-16 15:13 ` Mike Rapoport
2019-01-16 14:32 ` [Xen-devel] " Juergen Gross
2019-01-16 15:18 ` Rob Herring
2019-01-17 7:06 ` Guo Ren
2019-01-18 8:43 ` Heiko Carstens
2019-01-18 18:02 ` Paul Burton
2019-01-16 13:44 ` [PATCH 20/21] memblock: memblock_alloc_try_nid: don't panic Mike Rapoport
2019-01-16 13:44 ` [PATCH 21/21] memblock: drop memblock_alloc_*_nopanic() variants Mike Rapoport
2019-01-17 9:28 ` Petr Mladek
2019-01-18 8:42 ` Greg Kroah-Hartman
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=1547646261-32535-4-git-send-email-rppt@linux.ibm.com \
--to=rppt@linux.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=catalin.marinas@arm.com \
--cc=dalias@libc.org \
--cc=davem@davemloft.net \
--cc=dennis@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=geert@linux-m68k.org \
--cc=green.hu@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=guoren@kernel.org \
--cc=gxt@pku.edu.cn \
--cc=hch@lst.de \
--cc=heiko.carstens@de.ibm.com \
--cc=jcmvbkbc@gmail.com \
--cc=kasan-dev@googlegroups.com \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-c6x-dev@linux-c6x.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-snps-arc@lists.infradead.org \
--cc=linux-um@lists.infradead.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=linux@armlinux.org.uk \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mattst88@gmail.com \
--cc=monstr@monstr.eu \
--cc=mpe@ellerman.id.au \
--cc=msalter@redhat.com \
--cc=openrisc@lists.librecores.org \
--cc=paul.burton@mips.com \
--cc=pmladek@suse.com \
--cc=richard@nod.at \
--cc=robh+dt@kernel.org \
--cc=shorne@gmail.com \
--cc=sparclinux@vger.kernel.org \
--cc=tony.luck@intel.com \
--cc=uclinux-h8-devel@lists.sourceforge.jp \
--cc=vgupta@synopsys.com \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.org \
--cc=ysato@users.sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).