diff for duplicates of <55B8BB29.3000202@citrix.com> diff --git a/a/1.txt b/N1/1.txt index f39dc27..38b9da5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,7 +11,8 @@ On 29/07/15 12:35, Julien Grall wrote: >>> @@ -314,7 +314,7 @@ static void xenvif_gop_frag_copy(struct xenvif_queue *queue, struct sk_buff *skb >>> } else { >>> copy_gop->source.domid = DOMID_SELF; ->>> copy_gop->source.u.gmfn >>> - virt_to_mfn(page_address(page)); +>>> copy_gop->source.u.gmfn = +>>> - virt_to_mfn(page_address(page)); >>> + virt_to_gfn(page_address(page)); >>> } >>> copy_gop->source.offset = offset; @@ -19,10 +20,12 @@ On 29/07/15 12:35, Julien Grall wrote: >>> @@ -1284,7 +1284,7 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue, >>> queue->tx_copy_ops[*copy_ops].source.offset = txreq.offset; >>> ->>> queue->tx_copy_ops[*copy_ops].dest.u.gmfn >>> - virt_to_mfn(skb->data); +>>> queue->tx_copy_ops[*copy_ops].dest.u.gmfn = +>>> - virt_to_mfn(skb->data); >>> + virt_to_gfn(skb->data); >>> queue->tx_copy_ops[*copy_ops].dest.domid = DOMID_SELF; ->>> queue->tx_copy_ops[*copy_ops].dest.offset >>> offset_in_page(skb->data); +>>> queue->tx_copy_ops[*copy_ops].dest.offset = +>>> offset_in_page(skb->data); >> >> Reviewed-by: Wei Liu <wei.liu2@citrix.com> >> diff --git a/a/content_digest b/N1/content_digest index 249383f..1917c42 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,8 +4,32 @@ "ref\055B8BA9A.8000502@citrix.com\0" "From\0David Vrabel <david.vrabel@citrix.com>\0" "Subject\0Re: [Xen-devel] [PATCH 4/8] xen: Use the correctly the Xen memory terminologies\0" - "Date\0Wed, 29 Jul 2015 11:38:17 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Wed, 29 Jul 2015 12:38:17 +0100\0" + "To\0Julien Grall <julien.grall@citrix.com>" + " Wei Liu <wei.liu2@citrix.com>\0" + "Cc\0linux-fbdev@vger.kernel.org" + H. Peter Anvin <hpa@zytor.com> + Thomas Gleixner <tglx@linutronix.de> + stefano.stabellini@eu.citrix.com + Russell King <linux@arm.linux.org.uk> + linux-scsi@vger.kernel.org + x86@kernel.org + Tomi Valkeinen <tomi.valkeinen@ti.com> + Jiri Slaby <jslaby@suse.com> + xen-devel@lists.xenproject.org + Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> + linux-input@vger.kernel.org + ian.campbell@citrix.com + James E.J. Bottomley <JBottomley@odin.com> + Boris Ostrovsky <boris.ostrovsky@oracle.com> + Ingo Molnar <mingo@redhat.com> + linux-arm-kernel@lists.infradead.org + Juergen Gross <jgross@suse.com> + Greg Kroah-Hartman <gregkh@linuxfoundation.org> + Dmitry Torokhov <dmitry.torokhov@gmail.com> + linux-kernel@vger.kernel.org + netdev@vger.kernel.org + " linuxppc-dev@lists.ozlabs.org\0" "\00:1\0" "b\0" "On 29/07/15 12:35, Julien Grall wrote:\n" @@ -21,7 +45,8 @@ ">>> @@ -314,7 +314,7 @@ static void xenvif_gop_frag_copy(struct xenvif_queue *queue, struct sk_buff *skb\n" ">>> \t\t} else {\n" ">>> \t\t\tcopy_gop->source.domid = DOMID_SELF;\n" - ">>> \t\t\tcopy_gop->source.u.gmfn >>> -\t\t\t\tvirt_to_mfn(page_address(page));\n" + ">>> \t\t\tcopy_gop->source.u.gmfn =\n" + ">>> -\t\t\t\tvirt_to_mfn(page_address(page));\n" ">>> +\t\t\t\tvirt_to_gfn(page_address(page));\n" ">>> \t\t}\n" ">>> \t\tcopy_gop->source.offset = offset;\n" @@ -29,10 +54,12 @@ ">>> @@ -1284,7 +1284,7 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue,\n" ">>> \t\tqueue->tx_copy_ops[*copy_ops].source.offset = txreq.offset;\n" ">>> \n" - ">>> \t\tqueue->tx_copy_ops[*copy_ops].dest.u.gmfn >>> -\t\t\tvirt_to_mfn(skb->data);\n" + ">>> \t\tqueue->tx_copy_ops[*copy_ops].dest.u.gmfn =\n" + ">>> -\t\t\tvirt_to_mfn(skb->data);\n" ">>> +\t\t\tvirt_to_gfn(skb->data);\n" ">>> \t\tqueue->tx_copy_ops[*copy_ops].dest.domid = DOMID_SELF;\n" - ">>> \t\tqueue->tx_copy_ops[*copy_ops].dest.offset >>> \t\t\toffset_in_page(skb->data);\n" + ">>> \t\tqueue->tx_copy_ops[*copy_ops].dest.offset =\n" + ">>> \t\t\toffset_in_page(skb->data);\n" ">>\n" ">> Reviewed-by: Wei Liu <wei.liu2@citrix.com>\n" ">>\n" @@ -49,4 +76,4 @@ "\n" David -4c8f3cb62a0d14164cc68417f59ee18c36da194e5b3b832325b1183e2ea4a015 +b23e6338ba41577c0164255dda2e438965963b347bff43943bbd2e2e5364d97a
diff --git a/a/1.txt b/N2/1.txt index f39dc27..38b9da5 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -11,7 +11,8 @@ On 29/07/15 12:35, Julien Grall wrote: >>> @@ -314,7 +314,7 @@ static void xenvif_gop_frag_copy(struct xenvif_queue *queue, struct sk_buff *skb >>> } else { >>> copy_gop->source.domid = DOMID_SELF; ->>> copy_gop->source.u.gmfn >>> - virt_to_mfn(page_address(page)); +>>> copy_gop->source.u.gmfn = +>>> - virt_to_mfn(page_address(page)); >>> + virt_to_gfn(page_address(page)); >>> } >>> copy_gop->source.offset = offset; @@ -19,10 +20,12 @@ On 29/07/15 12:35, Julien Grall wrote: >>> @@ -1284,7 +1284,7 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue, >>> queue->tx_copy_ops[*copy_ops].source.offset = txreq.offset; >>> ->>> queue->tx_copy_ops[*copy_ops].dest.u.gmfn >>> - virt_to_mfn(skb->data); +>>> queue->tx_copy_ops[*copy_ops].dest.u.gmfn = +>>> - virt_to_mfn(skb->data); >>> + virt_to_gfn(skb->data); >>> queue->tx_copy_ops[*copy_ops].dest.domid = DOMID_SELF; ->>> queue->tx_copy_ops[*copy_ops].dest.offset >>> offset_in_page(skb->data); +>>> queue->tx_copy_ops[*copy_ops].dest.offset = +>>> offset_in_page(skb->data); >> >> Reviewed-by: Wei Liu <wei.liu2@citrix.com> >> diff --git a/a/content_digest b/N2/content_digest index 249383f..2dcdb97 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -4,8 +4,33 @@ "ref\055B8BA9A.8000502@citrix.com\0" "From\0David Vrabel <david.vrabel@citrix.com>\0" "Subject\0Re: [Xen-devel] [PATCH 4/8] xen: Use the correctly the Xen memory terminologies\0" - "Date\0Wed, 29 Jul 2015 11:38:17 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Wed, 29 Jul 2015 12:38:17 +0100\0" + "To\0Julien Grall <julien.grall@citrix.com>" + " Wei Liu <wei.liu2@citrix.com>\0" + "Cc\0linux-fbdev@vger.kernel.org" + H. Peter Anvin <hpa@zytor.com> + Thomas Gleixner <tglx@linutronix.de> + stefano.stabellini@eu.citrix.com + Russell King <linux@arm.linux.org.uk> + linux-scsi@vger.kernel.org + x86@kernel.org + Tomi Valkeinen <tomi.valkeinen@ti.com> + Jiri Slaby <jslaby@suse.com> + xen-devel@lists.xenproject.org + Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> + linux-input@vger.kernel.org + ian.campbell@citrix.com + James E.J. Bottomley <JBottomley@odin.com> + Boris Ostrovsky <boris.ostrovsky@oracle.com> + Ingo Molnar <mingo@redhat.com> + linux-arm-kernel@lists.infradead.org + Juergen Gross <jgross@suse.com> + Greg Kroah-Hartman <gregkh@linuxfoundation.org> + Dmitry Torokhov <dmitry.torokhov@gmail.com> + linux-kernel@vger.kernel.org + netdev@vger.kernel.org + linuxppc-dev@lists.ozlabs.org + " Roger Pau Monn\303\251 <roger.pau@citrix.com>\0" "\00:1\0" "b\0" "On 29/07/15 12:35, Julien Grall wrote:\n" @@ -21,7 +46,8 @@ ">>> @@ -314,7 +314,7 @@ static void xenvif_gop_frag_copy(struct xenvif_queue *queue, struct sk_buff *skb\n" ">>> \t\t} else {\n" ">>> \t\t\tcopy_gop->source.domid = DOMID_SELF;\n" - ">>> \t\t\tcopy_gop->source.u.gmfn >>> -\t\t\t\tvirt_to_mfn(page_address(page));\n" + ">>> \t\t\tcopy_gop->source.u.gmfn =\n" + ">>> -\t\t\t\tvirt_to_mfn(page_address(page));\n" ">>> +\t\t\t\tvirt_to_gfn(page_address(page));\n" ">>> \t\t}\n" ">>> \t\tcopy_gop->source.offset = offset;\n" @@ -29,10 +55,12 @@ ">>> @@ -1284,7 +1284,7 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue,\n" ">>> \t\tqueue->tx_copy_ops[*copy_ops].source.offset = txreq.offset;\n" ">>> \n" - ">>> \t\tqueue->tx_copy_ops[*copy_ops].dest.u.gmfn >>> -\t\t\tvirt_to_mfn(skb->data);\n" + ">>> \t\tqueue->tx_copy_ops[*copy_ops].dest.u.gmfn =\n" + ">>> -\t\t\tvirt_to_mfn(skb->data);\n" ">>> +\t\t\tvirt_to_gfn(skb->data);\n" ">>> \t\tqueue->tx_copy_ops[*copy_ops].dest.domid = DOMID_SELF;\n" - ">>> \t\tqueue->tx_copy_ops[*copy_ops].dest.offset >>> \t\t\toffset_in_page(skb->data);\n" + ">>> \t\tqueue->tx_copy_ops[*copy_ops].dest.offset =\n" + ">>> \t\t\toffset_in_page(skb->data);\n" ">>\n" ">> Reviewed-by: Wei Liu <wei.liu2@citrix.com>\n" ">>\n" @@ -49,4 +77,4 @@ "\n" David -4c8f3cb62a0d14164cc68417f59ee18c36da194e5b3b832325b1183e2ea4a015 +12be1115395e08698c899ec3a68a4ada680ba66f1c1b3dc62a26adf8c42310a1
diff --git a/a/1.txt b/N3/1.txt index f39dc27..38b9da5 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -11,7 +11,8 @@ On 29/07/15 12:35, Julien Grall wrote: >>> @@ -314,7 +314,7 @@ static void xenvif_gop_frag_copy(struct xenvif_queue *queue, struct sk_buff *skb >>> } else { >>> copy_gop->source.domid = DOMID_SELF; ->>> copy_gop->source.u.gmfn >>> - virt_to_mfn(page_address(page)); +>>> copy_gop->source.u.gmfn = +>>> - virt_to_mfn(page_address(page)); >>> + virt_to_gfn(page_address(page)); >>> } >>> copy_gop->source.offset = offset; @@ -19,10 +20,12 @@ On 29/07/15 12:35, Julien Grall wrote: >>> @@ -1284,7 +1284,7 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue, >>> queue->tx_copy_ops[*copy_ops].source.offset = txreq.offset; >>> ->>> queue->tx_copy_ops[*copy_ops].dest.u.gmfn >>> - virt_to_mfn(skb->data); +>>> queue->tx_copy_ops[*copy_ops].dest.u.gmfn = +>>> - virt_to_mfn(skb->data); >>> + virt_to_gfn(skb->data); >>> queue->tx_copy_ops[*copy_ops].dest.domid = DOMID_SELF; ->>> queue->tx_copy_ops[*copy_ops].dest.offset >>> offset_in_page(skb->data); +>>> queue->tx_copy_ops[*copy_ops].dest.offset = +>>> offset_in_page(skb->data); >> >> Reviewed-by: Wei Liu <wei.liu2@citrix.com> >> diff --git a/a/content_digest b/N3/content_digest index 249383f..5beb801 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -2,9 +2,9 @@ "ref\01438095769-2560-5-git-send-email-julien.grall@citrix.com\0" "ref\020150729101323.GW5111@zion.uk.xensource.com\0" "ref\055B8BA9A.8000502@citrix.com\0" - "From\0David Vrabel <david.vrabel@citrix.com>\0" - "Subject\0Re: [Xen-devel] [PATCH 4/8] xen: Use the correctly the Xen memory terminologies\0" - "Date\0Wed, 29 Jul 2015 11:38:17 +0000\0" + "From\0david.vrabel@citrix.com (David Vrabel)\0" + "Subject\0[Xen-devel] [PATCH 4/8] xen: Use the correctly the Xen memory terminologies\0" + "Date\0Wed, 29 Jul 2015 12:38:17 +0100\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -21,7 +21,8 @@ ">>> @@ -314,7 +314,7 @@ static void xenvif_gop_frag_copy(struct xenvif_queue *queue, struct sk_buff *skb\n" ">>> \t\t} else {\n" ">>> \t\t\tcopy_gop->source.domid = DOMID_SELF;\n" - ">>> \t\t\tcopy_gop->source.u.gmfn >>> -\t\t\t\tvirt_to_mfn(page_address(page));\n" + ">>> \t\t\tcopy_gop->source.u.gmfn =\n" + ">>> -\t\t\t\tvirt_to_mfn(page_address(page));\n" ">>> +\t\t\t\tvirt_to_gfn(page_address(page));\n" ">>> \t\t}\n" ">>> \t\tcopy_gop->source.offset = offset;\n" @@ -29,10 +30,12 @@ ">>> @@ -1284,7 +1284,7 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue,\n" ">>> \t\tqueue->tx_copy_ops[*copy_ops].source.offset = txreq.offset;\n" ">>> \n" - ">>> \t\tqueue->tx_copy_ops[*copy_ops].dest.u.gmfn >>> -\t\t\tvirt_to_mfn(skb->data);\n" + ">>> \t\tqueue->tx_copy_ops[*copy_ops].dest.u.gmfn =\n" + ">>> -\t\t\tvirt_to_mfn(skb->data);\n" ">>> +\t\t\tvirt_to_gfn(skb->data);\n" ">>> \t\tqueue->tx_copy_ops[*copy_ops].dest.domid = DOMID_SELF;\n" - ">>> \t\tqueue->tx_copy_ops[*copy_ops].dest.offset >>> \t\t\toffset_in_page(skb->data);\n" + ">>> \t\tqueue->tx_copy_ops[*copy_ops].dest.offset =\n" + ">>> \t\t\toffset_in_page(skb->data);\n" ">>\n" ">> Reviewed-by: Wei Liu <wei.liu2@citrix.com>\n" ">>\n" @@ -49,4 +52,4 @@ "\n" David -4c8f3cb62a0d14164cc68417f59ee18c36da194e5b3b832325b1183e2ea4a015 +eafc024edcf55b89e4249883da3dfee43ed7fdf83f8b77b43697712bede8d8bb
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.