diff for duplicates of <20160608210322.GA4248@localhost> diff --git a/a/1.txt b/N1/1.txt index 640bc23..d0b7856 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -133,7 +133,7 @@ index 14cba60..1974567 100644 - */ - if (mmap_state != pci_mmap_mem) - write_combine = 0; -- else if (write_combine = 0) { +- else if (write_combine == 0) { - if (rp->flags & IORESOURCE_PREFETCH) - write_combine = 1; - } @@ -196,7 +196,7 @@ index 3f155e7..21f8d613 100644 ret = pci_mmap_page_range(dev, vma, fpriv->mmap_state, - fpriv->write_combine); -+ (fpriv->mmap_state = pci_mmap_mem) ? ++ (fpriv->mmap_state == pci_mmap_mem) ? + fpriv->write_combine : 0); if (ret < 0) return ret; diff --git a/a/content_digest b/N1/content_digest index 8b6f7f0..72cc430 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,8 +2,26 @@ "ref\020160604000642.28162-2-yinghai@kernel.org\0" "From\0Bjorn Helgaas <helgaas@kernel.org>\0" "Subject\0Re: [PATCH v12 01/15] PCI: Let pci_mmap_page_range() take extra resource pointer\0" - "Date\0Wed, 08 Jun 2016 21:03:22 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Wed, 8 Jun 2016 16:03:22 -0500\0" + "To\0Yinghai Lu <yinghai@kernel.org>\0" + "Cc\0Bjorn Helgaas <bhelgaas@google.com>" + David Miller <davem@davemloft.net> + Benjamin Herrenschmidt <benh@kernel.crashing.org> + Linus Torvalds <torvalds@linux-foundation.org> + Wei Yang <weiyang@linux.vnet.ibm.com> + Khalid Aziz <khalid.aziz@oracle.com> + linux-pci@vger.kernel.org + linux-kernel@vger.kernel.org + linux-arm-kernel@lists.infradead.org + linux-cris-kernel@axis.com + linux-ia64@vger.kernel.org + linux-mips@linux-mips.org + linux-am33-list@redhat.com + linux-parisc@vger.kernel.org + linuxppc-dev@lists.ozlabs.org + linux-sh@vger.kernel.org + sparclinux@vger.kernel.org + " linux-xtensa@linux-xtensa.org\0" "\00:1\0" "b\0" "On Fri, Jun 03, 2016 at 05:06:28PM -0700, Yinghai Lu wrote:\n" @@ -141,7 +159,7 @@ "-\t */\n" "-\tif (mmap_state != pci_mmap_mem)\n" "-\t\twrite_combine = 0;\n" - "-\telse if (write_combine = 0) {\n" + "-\telse if (write_combine == 0) {\n" "-\t\tif (rp->flags & IORESOURCE_PREFETCH)\n" "-\t\t\twrite_combine = 1;\n" "-\t}\n" @@ -204,9 +222,9 @@ " \tret = pci_mmap_page_range(dev, vma,\n" " \t\t\t\t fpriv->mmap_state,\n" "-\t\t\t\t fpriv->write_combine);\n" - "+\t\t\t\t (fpriv->mmap_state = pci_mmap_mem) ?\n" + "+\t\t\t\t (fpriv->mmap_state == pci_mmap_mem) ?\n" "+\t\t\t\t\tfpriv->write_combine : 0);\n" " \tif (ret < 0)\n" " \t\treturn ret;" -42ab8294530ba2b957c0463e38679ac713d93ba9c846f93d24a2ec07a396bae7 +3d5b0e6bfb9c2dee95be1d7783c970ca462c10401112da877ffc9393a7a0297d
diff --git a/a/1.txt b/N2/1.txt index 640bc23..4241c65 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -133,7 +133,7 @@ index 14cba60..1974567 100644 - */ - if (mmap_state != pci_mmap_mem) - write_combine = 0; -- else if (write_combine = 0) { +- else if (write_combine == 0) { - if (rp->flags & IORESOURCE_PREFETCH) - write_combine = 1; - } @@ -196,7 +196,13 @@ index 3f155e7..21f8d613 100644 ret = pci_mmap_page_range(dev, vma, fpriv->mmap_state, - fpriv->write_combine); -+ (fpriv->mmap_state = pci_mmap_mem) ? ++ (fpriv->mmap_state == pci_mmap_mem) ? + fpriv->write_combine : 0); if (ret < 0) return ret; + + +_______________________________________________ +linux-arm-kernel mailing list +linux-arm-kernel@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N2/content_digest index 8b6f7f0..66d373d 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,8 +2,26 @@ "ref\020160604000642.28162-2-yinghai@kernel.org\0" "From\0Bjorn Helgaas <helgaas@kernel.org>\0" "Subject\0Re: [PATCH v12 01/15] PCI: Let pci_mmap_page_range() take extra resource pointer\0" - "Date\0Wed, 08 Jun 2016 21:03:22 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Wed, 8 Jun 2016 16:03:22 -0500\0" + "To\0Yinghai Lu <yinghai@kernel.org>\0" + "Cc\0linux-mips@linux-mips.org" + Wei Yang <weiyang@linux.vnet.ibm.com> + linux-am33-list@redhat.com + linux-ia64@vger.kernel.org + linux-parisc@vger.kernel.org + linux-cris-kernel@axis.com + linux-sh@vger.kernel.org + Benjamin Herrenschmidt <benh@kernel.crashing.org> + linux-xtensa@linux-xtensa.org + linuxppc-dev@lists.ozlabs.org + linux-kernel@vger.kernel.org + sparclinux@vger.kernel.org + Khalid Aziz <khalid.aziz@oracle.com> + linux-pci@vger.kernel.org + Bjorn Helgaas <bhelgaas@google.com> + Linus Torvalds <torvalds@linux-foundation.org> + David Miller <davem@davemloft.net> + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Fri, Jun 03, 2016 at 05:06:28PM -0700, Yinghai Lu wrote:\n" @@ -141,7 +159,7 @@ "-\t */\n" "-\tif (mmap_state != pci_mmap_mem)\n" "-\t\twrite_combine = 0;\n" - "-\telse if (write_combine = 0) {\n" + "-\telse if (write_combine == 0) {\n" "-\t\tif (rp->flags & IORESOURCE_PREFETCH)\n" "-\t\t\twrite_combine = 1;\n" "-\t}\n" @@ -204,9 +222,15 @@ " \tret = pci_mmap_page_range(dev, vma,\n" " \t\t\t\t fpriv->mmap_state,\n" "-\t\t\t\t fpriv->write_combine);\n" - "+\t\t\t\t (fpriv->mmap_state = pci_mmap_mem) ?\n" + "+\t\t\t\t (fpriv->mmap_state == pci_mmap_mem) ?\n" "+\t\t\t\t\tfpriv->write_combine : 0);\n" " \tif (ret < 0)\n" - " \t\treturn ret;" + " \t\treturn ret;\n" + " \n" + "\n" + "_______________________________________________\n" + "linux-arm-kernel mailing list\n" + "linux-arm-kernel@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -42ab8294530ba2b957c0463e38679ac713d93ba9c846f93d24a2ec07a396bae7 +084f8c8a65aa61cfefe88e362b7e4956f742bf79ce3835d1d4c25f507995928c
diff --git a/a/1.txt b/N3/1.txt index 640bc23..d0b7856 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -133,7 +133,7 @@ index 14cba60..1974567 100644 - */ - if (mmap_state != pci_mmap_mem) - write_combine = 0; -- else if (write_combine = 0) { +- else if (write_combine == 0) { - if (rp->flags & IORESOURCE_PREFETCH) - write_combine = 1; - } @@ -196,7 +196,7 @@ index 3f155e7..21f8d613 100644 ret = pci_mmap_page_range(dev, vma, fpriv->mmap_state, - fpriv->write_combine); -+ (fpriv->mmap_state = pci_mmap_mem) ? ++ (fpriv->mmap_state == pci_mmap_mem) ? + fpriv->write_combine : 0); if (ret < 0) return ret; diff --git a/a/content_digest b/N3/content_digest index 8b6f7f0..d93ecf6 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,8 +1,8 @@ "ref\020160604000642.28162-1-yinghai@kernel.org\0" "ref\020160604000642.28162-2-yinghai@kernel.org\0" - "From\0Bjorn Helgaas <helgaas@kernel.org>\0" - "Subject\0Re: [PATCH v12 01/15] PCI: Let pci_mmap_page_range() take extra resource pointer\0" - "Date\0Wed, 08 Jun 2016 21:03:22 +0000\0" + "From\0helgaas@kernel.org (Bjorn Helgaas)\0" + "Subject\0[PATCH v12 01/15] PCI: Let pci_mmap_page_range() take extra resource pointer\0" + "Date\0Wed, 8 Jun 2016 16:03:22 -0500\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -141,7 +141,7 @@ "-\t */\n" "-\tif (mmap_state != pci_mmap_mem)\n" "-\t\twrite_combine = 0;\n" - "-\telse if (write_combine = 0) {\n" + "-\telse if (write_combine == 0) {\n" "-\t\tif (rp->flags & IORESOURCE_PREFETCH)\n" "-\t\t\twrite_combine = 1;\n" "-\t}\n" @@ -204,9 +204,9 @@ " \tret = pci_mmap_page_range(dev, vma,\n" " \t\t\t\t fpriv->mmap_state,\n" "-\t\t\t\t fpriv->write_combine);\n" - "+\t\t\t\t (fpriv->mmap_state = pci_mmap_mem) ?\n" + "+\t\t\t\t (fpriv->mmap_state == pci_mmap_mem) ?\n" "+\t\t\t\t\tfpriv->write_combine : 0);\n" " \tif (ret < 0)\n" " \t\treturn ret;" -42ab8294530ba2b957c0463e38679ac713d93ba9c846f93d24a2ec07a396bae7 +eb2af441b5d6c1a3d87d7e3fef311724da88cafe014304762aecb85c7aae6368
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.