| |
|
 |
|
 |
|
|
|
| |
|
|
xen-devel
[Xen-devel] linux-2.6-xen.hg missing bits from xen-unstable.hg cset 1103
|
To: |
Christian.Limpach@xxxxxxxxxxxx |
|
Subject: |
[Xen-devel] linux-2.6-xen.hg missing bits from xen-unstable.hg cset 11032 |
|
From: |
Aron Griffis <aron@xxxxxx> |
|
Date: |
Fri, 6 Oct 2006 09:16:24 -0400 |
|
Cc: |
Chris Wright <chrisw@xxxxxxxxxxxx>, xen-devel@xxxxxxxxxxxxxxxxxxx, Alex Williamson <alex.williamson@xxxxxx>, Juan Quintela <quintela@xxxxxxxxxx> |
|
Delivery-date: |
Fri, 06 Oct 2006 06:17:03 -0700 |
|
Envelope-to: |
www-data@xxxxxxxxxxxxxxxxxx |
|
List-help: |
<mailto:xen-devel-request@lists.xensource.com?subject=help> |
|
List-id: |
Xen developer discussion <xen-devel.lists.xensource.com> |
|
List-post: |
<mailto:xen-devel@lists.xensource.com> |
|
List-subscribe: |
<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe> |
|
List-unsubscribe: |
<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe> |
|
Mail-followup-to: |
Christian.Limpach@xxxxxxxxxxxx, Juan Quintela <quintela@xxxxxxxxxx>, Chris Wright <chrisw@xxxxxxxxxxxx>, Alex Williamson <alex.williamson@xxxxxx>, xen-devel@xxxxxxxxxxxxxxxxxxx |
|
Sender: |
xen-devel-bounces@xxxxxxxxxxxxxxxxxxx |
|
User-agent: |
Mutt/1.5.13 (2006-08-11) |
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@xxxxxx>
--- 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);
pgpjfLMDrtjYK.pgp
Description: PGP signature
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
| <Prev in Thread] |
Current Thread |
[Next in Thread> |
- [Xen-devel] linux-2.6-xen.hg missing bits from xen-unstable.hg cset 11032,
Aron Griffis <=
|
|
|
| |
|
Home