From: ard.biesheuvel@linaro.org (Ard Biesheuvel)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 1/6] of/fdt: make generic early_init_dt_add_memory_arch() a weak alias
Date: Mon, 21 Sep 2015 17:21:23 -0700 [thread overview]
Message-ID: <1442881288-13962-2-git-send-email-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <1442881288-13962-1-git-send-email-ard.biesheuvel@linaro.org>
The function early_init_dt_add_memory_arch() is defined as __weak
so that archs can override it. However, in this override implementation,
it may still be useful to invoke the generic implementation, so instead,
rename the generic version to early_init_dt_add_memory() and turn the
original definition into a weak alias. This way, the generic version can
still be called even in the presence of an arch specific override.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
drivers/of/fdt.c | 7 +++++--
include/linux/of_fdt.h | 1 +
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 07496560e5b9..8b758e10c9f8 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -969,7 +969,7 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,
#ifdef CONFIG_HAVE_MEMBLOCK
#define MAX_PHYS_ADDR ((phys_addr_t)~0)
-void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size)
+void __init early_init_dt_add_memory(u64 base, u64 size)
{
const u64 phys_offset = __pa(PAGE_OFFSET);
@@ -1027,7 +1027,7 @@ void * __init __weak early_init_dt_alloc_memory_arch(u64 size, u64 align)
return __va(memblock_alloc(size, align));
}
#else
-void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size)
+void __init early_init_dt_add_memory(u64 base, u64 size)
{
WARN_ON(1);
}
@@ -1047,6 +1047,9 @@ void * __init __weak early_init_dt_alloc_memory_arch(u64 size, u64 align)
}
#endif
+__weak __alias(early_init_dt_add_memory)
+void early_init_dt_add_memory_arch(u64 base, u64 size);
+
bool __init early_init_dt_verify(void *params)
{
if (!params)
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
index df9ef3801812..463a06ba87ac 100644
--- a/include/linux/of_fdt.h
+++ b/include/linux/of_fdt.h
@@ -65,6 +65,7 @@ extern int early_init_dt_scan_memory(unsigned long node, const char *uname,
int depth, void *data);
extern void early_init_fdt_scan_reserved_mem(void);
extern void early_init_fdt_reserve_self(void);
+extern void early_init_dt_add_memory(u64 base, u64 size);
extern void early_init_dt_add_memory_arch(u64 base, u64 size);
extern int early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size,
bool no_map);
--
1.9.1
next prev parent reply other threads:[~2015-09-22 0:21 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-22 0:21 [PATCH v3 0/6] arm64 UEFI early FDT handling Ard Biesheuvel
2015-09-22 0:21 ` Ard Biesheuvel [this message]
2015-09-22 0:21 ` [PATCH v3 2/6] arm64: override generic version of early_init_dt_add_memory_arch() Ard Biesheuvel
2015-09-22 0:21 ` [PATCH v3 3/6] efi: move FDT handling to separate object file Ard Biesheuvel
2015-09-22 0:21 ` [PATCH v3 4/6] arm64/efi: move EFI /chosen node parsing before early FDT processing Ard Biesheuvel
2015-09-22 0:21 ` [PATCH v3 5/6] arm64/efi: ignore DT memory nodes instead of removing them Ard Biesheuvel
2015-09-22 0:21 ` [PATCH v3 6/6] arm64/efi: ignore DT memreserve entries " Ard Biesheuvel
2015-09-29 7:38 ` [PATCH v3 0/6] arm64 UEFI early FDT handling Ard Biesheuvel
2015-11-16 10:43 ` Will Deacon
2015-11-16 10:57 ` Ard Biesheuvel
2015-11-16 10:57 ` Catalin Marinas
2015-11-16 11:00 ` Ard Biesheuvel
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=1442881288-13962-2-git-send-email-ard.biesheuvel@linaro.org \
--to=ard.biesheuvel@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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).