From: tip-bot for Yinghai Lu <yinghai@kernel.org>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
yinghai@kernel.org, balbi@ti.com, khilman@deeprootsystems.com,
tomi.valkeinen@nokia.com, notasas@gmail.com,
benh@kernel.crashing.org, tglx@linutronix.de, mingo@elte.hu
Subject: [tip:core/memblock] memblock/arm: Fix memblock_region_is_memory() typo
Date: Fri, 8 Oct 2010 07:18:57 GMT [thread overview]
Message-ID: <tip-5fd03ddab7fdbc44bfb2d183a4531c26a8dbca5a@git.kernel.org> (raw)
In-Reply-To: <4CABFADA.9020305@kernel.org>
Commit-ID: 5fd03ddab7fdbc44bfb2d183a4531c26a8dbca5a
Gitweb: http://git.kernel.org/tip/5fd03ddab7fdbc44bfb2d183a4531c26a8dbca5a
Author: Yinghai Lu <yinghai@kernel.org>
AuthorDate: Tue, 5 Oct 2010 21:28:10 -0700
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Fri, 8 Oct 2010 09:14:36 +0200
memblock/arm: Fix memblock_region_is_memory() typo
Fix typo in commit dbe3039 ("memblock/arm: Use memblock_region_is_memory()
for omap fb") - it should be memblock_is_region_memory().
Reported-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: ext Grazvydas Ignotas <notasas@gmail.com>
LKML-Reference: <4CABFADA.9020305@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/arm/plat-omap/fb.c | 2 +-
drivers/video/omap2/vram.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c
index 441af2b..7193481 100644
--- a/arch/arm/plat-omap/fb.c
+++ b/arch/arm/plat-omap/fb.c
@@ -173,7 +173,7 @@ static int check_fbmem_region(int region_idx, struct omapfb_mem_region *rg,
static int valid_sdram(unsigned long addr, unsigned long size)
{
- return memblock_region_is_memory(addr, size);
+ return memblock_is_region_memory(addr, size);
}
static int reserve_sdram(unsigned long addr, unsigned long size)
diff --git a/drivers/video/omap2/vram.c b/drivers/video/omap2/vram.c
index 34514a8..fed2a72 100644
--- a/drivers/video/omap2/vram.c
+++ b/drivers/video/omap2/vram.c
@@ -555,7 +555,7 @@ void __init omap_vram_reserve_sdram_memblock(void)
if (paddr) {
if ((paddr & ~PAGE_MASK) ||
- !memblock_region_is_memory(paddr, size)) {
+ !memblock_is_region_memory(paddr, size)) {
pr_err("Illegal SDRAM region for VRAM\n");
return;
}
prev parent reply other threads:[~2010-10-08 7:19 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-01 15:57 multiple linux-next OMAP3 build errors Grazvydas Ignotas
2010-10-01 15:57 ` Grazvydas Ignotas
2010-10-01 16:12 ` Anand Gadiyar
2010-10-01 16:12 ` Anand Gadiyar
2010-10-01 16:57 ` Tony Lindgren
2010-10-01 16:57 ` Tony Lindgren
2010-10-04 6:29 ` Tomi Valkeinen
2010-10-04 6:29 ` Tomi Valkeinen
2010-10-04 11:04 ` Gadiyar, Anand
2010-10-04 11:04 ` Gadiyar, Anand
2010-10-04 22:30 ` Benjamin Herrenschmidt
2010-10-04 22:30 ` Benjamin Herrenschmidt
2010-10-04 22:43 ` Yinghai Lu
2010-10-04 22:43 ` Yinghai Lu
2010-10-06 4:28 ` Yinghai Lu
2010-10-06 4:28 ` Yinghai Lu
2010-10-08 7:18 ` tip-bot for Yinghai Lu [this message]
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=tip-5fd03ddab7fdbc44bfb2d183a4531c26a8dbca5a@git.kernel.org \
--to=yinghai@kernel.org \
--cc=balbi@ti.com \
--cc=benh@kernel.crashing.org \
--cc=hpa@zytor.com \
--cc=khilman@deeprootsystems.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=notasas@gmail.com \
--cc=tglx@linutronix.de \
--cc=tomi.valkeinen@nokia.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.