From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jeremy Fitzhardinge <jeremy@goop•org>,
Xen Devel <Xen-devel@lists•xensource.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: build failure after merge of the xen tree
Date: Wed, 27 Oct 2010 13:02:49 +1100 [thread overview]
Message-ID: <20101027130249.5b4bc6ff.sfr@canb.auug.org.au> (raw)
Hi all,
After merging the xen tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
arch/x86/xen/setup.c: In function 'xen_add_extra_mem':
arch/x86/xen/setup.c:65: error: implicit declaration of function 'reserve_early'
Caused by commit 42ee1471e9b879479a15debac752314a596c738e ("xen:
implement "extra" memory to reserve space for pages not present at boot")
interacting with commit a9ce6bc15100023b411f8117e53a016d61889800 ("x86,
memblock: Replace e820_/_early string with memblock_"). This latter
commit was in the xen tree yesterday (via a merge of tip/core/memblock)
but has been removed today (but it is in Linus' tree).
Linus will need this fixup patch when he merges the xen tree. I have
applied it to linux-next today and can carry it as necessary.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Wed, 27 Oct 2010 12:57:06 +1100
Subject: [PATCH] xen: merge fixup for reserve_early name change
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
arch/x86/xen/setup.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index 1163bc5..105db25 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -62,7 +62,7 @@ static __init void xen_add_extra_mem(unsigned long pages)
e820_add_region(extra_start, size, E820_RAM);
sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
- reserve_early(extra_start, extra_start + size, "XEN EXTRA");
+ memblock_x86_reserve_range(extra_start, extra_start + size, "XEN EXTRA");
xen_extra_mem_size += size;
--
1.7.2.3
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
next reply other threads:[~2010-10-27 2:02 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-27 2:02 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-09-15 5:27 linux-next: build failure after merge of the xen tree Stephen Rothwell
2011-09-15 9:10 ` Jeremy Fitzhardinge
2010-10-25 2:30 Stephen Rothwell
2010-10-25 8:38 ` Ian Campbell
2010-10-25 23:57 ` Jeremy Fitzhardinge
2010-07-28 4:18 Stephen Rothwell
2010-07-23 4:01 Stephen Rothwell
2010-07-23 4:48 ` Jeremy Fitzhardinge
2010-07-23 5:56 ` Jeremy Fitzhardinge
2010-07-23 6:05 ` Jeremy Fitzhardinge
2010-07-23 6:59 ` Stephen Rothwell
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=20101027130249.5b4bc6ff.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Xen-devel@lists$(echo .)xensource.com \
--cc=jeremy@goop$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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