diff for duplicates of <55B8BA9A.8000502@citrix.com> diff --git a/a/1.txt b/N1/1.txt index c866101..424e66f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -10,7 +10,8 @@ On 29/07/15 11:13, Wei Liu 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; @@ -18,10 +19,12 @@ On 29/07/15 11:13, Wei Liu 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 408526d..82791a4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,8 +3,33 @@ "ref\020150729101323.GW5111@zion.uk.xensource.com\0" "From\0Julien Grall <julien.grall@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:35:54 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Wed, 29 Jul 2015 12:35:54 +0100\0" + "To\0Wei 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 + David Vrabel <david.vrabel@citrix.com> + netdev@vger.kernel.org + linuxppc-dev@lists.ozlabs.org + " =\0" "\00:1\0" "b\0" "Hi Wei,\n" @@ -19,7 +44,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" @@ -27,10 +53,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" @@ -48,4 +76,4 @@ "-- \n" Julien Grall -8743380b6dfa4a155a75e90e1d2d93ce0c6d86e095e835b598f4afabc4fd4617 +9e4c061a5dc4b05d716e6be6542648a33d0a0be8c2ac9c1b8ebad9175278d126
diff --git a/a/1.txt b/N2/1.txt index c866101..424e66f 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -10,7 +10,8 @@ On 29/07/15 11:13, Wei Liu 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; @@ -18,10 +19,12 @@ On 29/07/15 11:13, Wei Liu 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 408526d..81eacfb 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,8 +3,33 @@ "ref\020150729101323.GW5111@zion.uk.xensource.com\0" "From\0Julien Grall <julien.grall@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:35:54 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Wed, 29 Jul 2015 12:35:54 +0100\0" + "To\0Wei 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 + David Vrabel <david.vrabel@citrix.com> + netdev@vger.kernel.org + linuxppc-dev@lists.ozlabs.org + " Roger Pau Monn\303\251 <roger.pau@citrix.com>\0" "\00:1\0" "b\0" "Hi Wei,\n" @@ -19,7 +44,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" @@ -27,10 +53,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" @@ -48,4 +76,4 @@ "-- \n" Julien Grall -8743380b6dfa4a155a75e90e1d2d93ce0c6d86e095e835b598f4afabc4fd4617 +324b7bb02672c1ddf037dba838a5feab37921d0258e468e08cda64cd18b5fa66
diff --git a/a/1.txt b/N3/1.txt index c866101..424e66f 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -10,7 +10,8 @@ On 29/07/15 11:13, Wei Liu 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; @@ -18,10 +19,12 @@ On 29/07/15 11:13, Wei Liu 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 408526d..0fedf1b 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,9 +1,9 @@ "ref\01438095769-2560-1-git-send-email-julien.grall@citrix.com\0" "ref\01438095769-2560-5-git-send-email-julien.grall@citrix.com\0" "ref\020150729101323.GW5111@zion.uk.xensource.com\0" - "From\0Julien Grall <julien.grall@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:35:54 +0000\0" + "From\0julien.grall@citrix.com (Julien Grall)\0" + "Subject\0[Xen-devel] [PATCH 4/8] xen: Use the correctly the Xen memory terminologies\0" + "Date\0Wed, 29 Jul 2015 12:35:54 +0100\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -19,7 +19,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" @@ -27,10 +28,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" @@ -48,4 +51,4 @@ "-- \n" Julien Grall -8743380b6dfa4a155a75e90e1d2d93ce0c6d86e095e835b598f4afabc4fd4617 +f0838b77839a7dfe85b66f1ce435954183da1db12a3f165c0c9f4a8ba4a0d56a
diff --git a/a/1.txt b/N4/1.txt index c866101..424e66f 100644 --- a/a/1.txt +++ b/N4/1.txt @@ -10,7 +10,8 @@ On 29/07/15 11:13, Wei Liu 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; @@ -18,10 +19,12 @@ On 29/07/15 11:13, Wei Liu 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/N4/content_digest index 408526d..88aea37 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -3,8 +3,33 @@ "ref\020150729101323.GW5111@zion.uk.xensource.com\0" "From\0Julien Grall <julien.grall@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:35:54 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Wed, 29 Jul 2015 12:35:54 +0100\0" + "To\0Wei Liu <wei.liu2@citrix.com>\0" + "Cc\0<linux-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> + David Vrabel <david.vrabel@citrix.com> + <netdev@vger.kernel.org> + <linuxppc-dev@lists.ozlabs.org> + " =\0" "\00:1\0" "b\0" "Hi Wei,\n" @@ -19,7 +44,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" @@ -27,10 +53,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" @@ -48,4 +76,4 @@ "-- \n" Julien Grall -8743380b6dfa4a155a75e90e1d2d93ce0c6d86e095e835b598f4afabc4fd4617 +698202f4a07ade2cd13f0b98681afa601143847dcd03e8fd179435a902b18f22
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.