| |
|
 |
|
 |
|
|
|
| |
|
|
xen-devel
Re: [Xen-devel] linux-next: manual merge of the xen tree with the swiotl
|
To: |
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> |
|
Subject: |
Re: [Xen-devel] linux-next: manual merge of the xen tree with the swiotlb tree |
|
From: |
Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx> |
|
Date: |
Tue, 3 Aug 2010 09:48:29 -0400 |
|
Cc: |
Konrad@xxxxxxxxxxxxxxxxxxxx, Jeremy Fitzhardinge <jeremy@xxxxxxxx>, Xen Devel <Xen-devel@xxxxxxxxxxxxxxxxxxx>, Ian Campbell <ian.campbell@xxxxxxxxxx>, Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>, linux-kernel@xxxxxxxxxxxxxxx, Alex Nixon <alex.nixon@xxxxxxxxxx>, linux-next@xxxxxxxxxxxxxxx |
|
Delivery-date: |
Tue, 03 Aug 2010 06:49:48 -0700 |
|
Envelope-to: |
www-data@xxxxxxxxxxxxxxxxxxx |
|
In-reply-to: |
<20100803141646.594e0fee.sfr@xxxxxxxxxxxxxxxx> |
|
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/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe> |
|
List-unsubscribe: |
<http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe> |
|
References: |
<20100803141646.594e0fee.sfr@xxxxxxxxxxxxxxxx> |
|
Sender: |
xen-devel-bounces@xxxxxxxxxxxxxxxxxxx |
|
User-agent: |
Mutt/1.5.20 (2009-12-10) |
On Tue, Aug 03, 2010 at 02:16:46PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the xen tree got a conflict in
> include/xen/xen-ops.h between commit
> 08bbc9da92f7e44b9c208c6a1adba70c403b255e ("xen: Add
> xen_create_contiguous_region") from the swiotlb tree and commit
> 016b6f5fe8398b0291cece60b749d7c930a2e09c ("xen: Add suspend/resume
> support for PV on HVM guests") from the xen tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix as necessary.
Thank you.
> --
> Cheers,
> Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
>
> diff --cc include/xen/xen-ops.h
> index d789c93,46bc81e..0000000
> --- a/include/xen/xen-ops.h
> +++ b/include/xen/xen-ops.h
> @@@ -14,10 -15,6 +15,12 @@@ void xen_mm_unpin_all(void)
> void xen_timer_resume(void);
> void xen_arch_resume(void);
>
> +extern unsigned long *xen_contiguous_bitmap;
> +int xen_create_contiguous_region(unsigned long vstart, unsigned int order,
> + unsigned int address_bits);
> +
> +void xen_destroy_contiguous_region(unsigned long vstart, unsigned int
> order);
> +
> + int xen_setup_shutdown_event(void);
> +
> #endif /* INCLUDE_XEN_OPS_H */
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@xxxxxxxxxxxxxxxxxxx
> http://lists.xensource.com/xen-devel
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
|
|
| |
|
Home