From: Aron Griffis <aron@hp.com>
To: Christian.Limpach@cl.cam.ac.uk
Cc: Chris Wright <chrisw@sous-sol.org>,
xen-devel@lists.xensource.com,
Alex Williamson <alex.williamson@hp.com>,
Juan Quintela <quintela@redhat.com>
Subject: linux-2.6-xen.hg missing bits from xen-unstable.hg cset 11032
Date: Fri, 6 Oct 2006 09:16:24 -0400 [thread overview]
Message-ID: <20061006131624.GB17932@fc.hp.com> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 1072 bytes --]
Hi Christian,
Trying to pull recent xen-unstable bits into linux-2.6-xen shows
a conflict in blkback.c. The problem is that some bits were
apparently lost when pulling xen-unstable.hg cset 11032. Here is the
necessary patch.
Signed-off-by: Aron Griffis <aron@hp.com>
--- linux-2.6-xen.hg/drivers/xen/blkback/blkback.c 2006-09-11 12:27:11.000000000 -0400
+++ xen-unstable.hg/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c 2006-09-28 14:56:10.000000000 -0400
@@ -514,17 +514,10 @@
mmap_pages = blkif_reqs * BLKIF_MAX_SEGMENTS_PER_REQUEST;
-#ifdef CONFIG_XEN_IA64_DOM0_NON_VP
- extern unsigned long alloc_empty_foreign_map_page_range(
- unsigned long pages);
- mmap_vstart = (unsigned long)
- alloc_empty_foreign_map_page_range(mmap_pages);
-#else /* ! ia64 */
page = balloon_alloc_empty_page_range(mmap_pages);
if (page == NULL)
return -ENOMEM;
mmap_vstart = (unsigned long)pfn_to_kaddr(page_to_pfn(page));
-#endif
pending_reqs = kmalloc(sizeof(pending_reqs[0]) *
blkif_reqs, GFP_KERNEL);
[-- Attachment #1.2: Type: application/pgp-signature, Size: 189 bytes --]
[-- Attachment #2: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
reply other threads:[~2006-10-06 13:16 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20061006131624.GB17932@fc.hp.com \
--to=aron@hp.com \
--cc=Christian.Limpach@cl.cam.ac.uk \
--cc=alex.williamson@hp.com \
--cc=chrisw@sous-sol.org \
--cc=quintela@redhat.com \
--cc=xen-devel@lists.xensource.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.