find_memory() isn't marked as __init, so if it isn't fully inlined, it ends up
tripping:
Error: size of dom0_build.o:.text is 0x0c1
Fixes: 73b47eea21 "x86/dom0: improve PVH initrd and metadata placement"
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
CC: Wei Liu <wl@xen.org>
CC: Roger Pau Monné <roger.pau@citrix.com>
---
xen/arch/x86/hvm/dom0_build.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c
index c41504f22d..ee1d50acc6 100644
--- a/xen/arch/x86/hvm/dom0_build.c
+++ b/xen/arch/x86/hvm/dom0_build.c
@@ -490,8 +490,8 @@ static int __init pvh_populate_p2m(struct domain *d)
#undef MB1_PAGES
}
-static paddr_t find_memory(const struct domain *d, const struct elf_binary *elf,
- size_t size)
+static paddr_t __init find_memory(
+ const struct domain *d, const struct elf_binary *elf, size_t size)
{
paddr_t kernel_start = (paddr_t)elf->dest_base & PAGE_MASK;
paddr_t kernel_end = ROUNDUP((paddr_t)elf->dest_base + elf->dest_size,
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel