diff for duplicates of <20180305192134.32207-6-decui@microsoft.com> diff --git a/a/1.txt b/N1/1.txt index 476832a..ea42948 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,19 +18,17 @@ diff --git a/drivers/pci/host/pci-hyperv.c b/drivers/pci/host/pci-hyperv.c index 3a385212f666..d3aa6736a9bb 100644 --- a/drivers/pci/host/pci-hyperv.c +++ b/drivers/pci/host/pci-hyperv.c -@@ -1733,6 +1733,7 @@ static void hv_pci_devices_present(struct hv_pcibus_d= -evice *hbus, +@@ -1733,6 +1733,7 @@ static void hv_pci_devices_present(struct hv_pcibus_device *hbus, struct hv_dr_state *dr; struct hv_dr_work *dr_wrk; unsigned long flags; + bool pending_dr; -=20 - dr_wrk =3D kzalloc(sizeof(*dr_wrk), GFP_NOWAIT); + + dr_wrk = kzalloc(sizeof(*dr_wrk), GFP_NOWAIT); if (!dr_wrk) -@@ -1756,11 +1757,23 @@ static void hv_pci_devices_present(struct hv_pcibus= -_device *hbus, +@@ -1756,11 +1757,23 @@ static void hv_pci_devices_present(struct hv_pcibus_device *hbus, } -=20 + spin_lock_irqsave(&hbus->device_list_lock, flags); + + /* @@ -38,10 +36,10 @@ _device *hbus, + * which will see the new dr. Otherwise, we need to + * queue a new work. + */ -+ pending_dr =3D !list_empty(&hbus->dr_list); ++ pending_dr = !list_empty(&hbus->dr_list); list_add_tail(&dr->list_entry, &hbus->dr_list); - spin_unlock_irqrestore(&hbus->device_list_lock, flags); -=20 + - get_hvpcibus(hbus); - queue_work(hbus->wq, &dr_wrk->wrk); + if (pending_dr) { @@ -53,7 +51,11 @@ _device *hbus, + + spin_unlock_irqrestore(&hbus->device_list_lock, flags); } -=20 + /** ---=20 +-- 2.7.4 +_______________________________________________ +devel mailing list +devel@linuxdriverproject.org +http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel diff --git a/a/content_digest b/N1/content_digest index f905fa0..3503573 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -9,15 +9,14 @@ olaf@aepfle.de <olaf@aepfle.de> apw@canonical.com <apw@canonical.com> " jasowang@redhat.com <jasowang@redhat.com>\0" - "Cc\0linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>" + "Cc\0Haiyang Zhang <haiyangz@microsoft.com>" driverdev-devel@linuxdriverproject.org <driverdev-devel@linuxdriverproject.org> - Haiyang Zhang <haiyangz@microsoft.com> - vkuznets@redhat.com <vkuznets@redhat.com> - marcelo.cerri@canonical.com <marcelo.cerri@canonical.com> - Michael Kelley (EOSG) <Michael.H.Kelley@microsoft.com> - Dexuan Cui <decui@microsoft.com> + linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> + stable@vger.kernel.org <stable@vger.kernel.org> Jack Morgenstein <jackm@mellanox.com> - " stable@vger.kernel.org <stable@vger.kernel.org>\0" + " Michael Kelley \\(EOSG\\) <Michael.H.Kelley@microsoft.com>" + marcelo.cerri@canonical.com <marcelo.cerri@canonical.com> + " vkuznets@redhat.com <vkuznets@redhat.com>\0" "\00:1\0" "b\0" "If there is a pending work, we just need to add the new dr into\n" @@ -40,19 +39,17 @@ "index 3a385212f666..d3aa6736a9bb 100644\n" "--- a/drivers/pci/host/pci-hyperv.c\n" "+++ b/drivers/pci/host/pci-hyperv.c\n" - "@@ -1733,6 +1733,7 @@ static void hv_pci_devices_present(struct hv_pcibus_d=\n" - "evice *hbus,\n" + "@@ -1733,6 +1733,7 @@ static void hv_pci_devices_present(struct hv_pcibus_device *hbus,\n" " \tstruct hv_dr_state *dr;\n" " \tstruct hv_dr_work *dr_wrk;\n" " \tunsigned long flags;\n" "+\tbool pending_dr;\n" - "=20\n" - " \tdr_wrk =3D kzalloc(sizeof(*dr_wrk), GFP_NOWAIT);\n" + " \n" + " \tdr_wrk = kzalloc(sizeof(*dr_wrk), GFP_NOWAIT);\n" " \tif (!dr_wrk)\n" - "@@ -1756,11 +1757,23 @@ static void hv_pci_devices_present(struct hv_pcibus=\n" - "_device *hbus,\n" + "@@ -1756,11 +1757,23 @@ static void hv_pci_devices_present(struct hv_pcibus_device *hbus,\n" " \t}\n" - "=20\n" + " \n" " \tspin_lock_irqsave(&hbus->device_list_lock, flags);\n" "+\n" "+\t/*\n" @@ -60,10 +57,10 @@ "+\t * which will see the new dr. Otherwise, we need to\n" "+\t * queue a new work.\n" "+\t */\n" - "+\tpending_dr =3D !list_empty(&hbus->dr_list);\n" + "+\tpending_dr = !list_empty(&hbus->dr_list);\n" " \tlist_add_tail(&dr->list_entry, &hbus->dr_list);\n" "-\tspin_unlock_irqrestore(&hbus->device_list_lock, flags);\n" - "=20\n" + " \n" "-\tget_hvpcibus(hbus);\n" "-\tqueue_work(hbus->wq, &dr_wrk->wrk);\n" "+\tif (pending_dr) {\n" @@ -75,9 +72,13 @@ "+\n" "+\tspin_unlock_irqrestore(&hbus->device_list_lock, flags);\n" " }\n" - "=20\n" + " \n" " /**\n" - "--=20\n" - 2.7.4 + "-- \n" + "2.7.4\n" + "_______________________________________________\n" + "devel mailing list\n" + "devel@linuxdriverproject.org\n" + http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel -b42c7412d87b45eeff3b89a6441f1992352a40a402b5a3c9f8e203f54620dd40 +b0f84a31ce6283b9b3ebedeba12c9e883447e1cae10198318e7eddceed0fa2a6
diff --git a/a/1.txt b/N2/1.txt index 476832a..e4d4a1d 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -18,19 +18,17 @@ diff --git a/drivers/pci/host/pci-hyperv.c b/drivers/pci/host/pci-hyperv.c index 3a385212f666..d3aa6736a9bb 100644 --- a/drivers/pci/host/pci-hyperv.c +++ b/drivers/pci/host/pci-hyperv.c -@@ -1733,6 +1733,7 @@ static void hv_pci_devices_present(struct hv_pcibus_d= -evice *hbus, +@@ -1733,6 +1733,7 @@ static void hv_pci_devices_present(struct hv_pcibus_device *hbus, struct hv_dr_state *dr; struct hv_dr_work *dr_wrk; unsigned long flags; + bool pending_dr; -=20 - dr_wrk =3D kzalloc(sizeof(*dr_wrk), GFP_NOWAIT); + + dr_wrk = kzalloc(sizeof(*dr_wrk), GFP_NOWAIT); if (!dr_wrk) -@@ -1756,11 +1757,23 @@ static void hv_pci_devices_present(struct hv_pcibus= -_device *hbus, +@@ -1756,11 +1757,23 @@ static void hv_pci_devices_present(struct hv_pcibus_device *hbus, } -=20 + spin_lock_irqsave(&hbus->device_list_lock, flags); + + /* @@ -38,10 +36,10 @@ _device *hbus, + * which will see the new dr. Otherwise, we need to + * queue a new work. + */ -+ pending_dr =3D !list_empty(&hbus->dr_list); ++ pending_dr = !list_empty(&hbus->dr_list); list_add_tail(&dr->list_entry, &hbus->dr_list); - spin_unlock_irqrestore(&hbus->device_list_lock, flags); -=20 + - get_hvpcibus(hbus); - queue_work(hbus->wq, &dr_wrk->wrk); + if (pending_dr) { @@ -53,7 +51,7 @@ _device *hbus, + + spin_unlock_irqrestore(&hbus->device_list_lock, flags); } -=20 + /** ---=20 +-- 2.7.4 diff --git a/a/content_digest b/N2/content_digest index f905fa0..3ca0f08 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -40,19 +40,17 @@ "index 3a385212f666..d3aa6736a9bb 100644\n" "--- a/drivers/pci/host/pci-hyperv.c\n" "+++ b/drivers/pci/host/pci-hyperv.c\n" - "@@ -1733,6 +1733,7 @@ static void hv_pci_devices_present(struct hv_pcibus_d=\n" - "evice *hbus,\n" + "@@ -1733,6 +1733,7 @@ static void hv_pci_devices_present(struct hv_pcibus_device *hbus,\n" " \tstruct hv_dr_state *dr;\n" " \tstruct hv_dr_work *dr_wrk;\n" " \tunsigned long flags;\n" "+\tbool pending_dr;\n" - "=20\n" - " \tdr_wrk =3D kzalloc(sizeof(*dr_wrk), GFP_NOWAIT);\n" + " \n" + " \tdr_wrk = kzalloc(sizeof(*dr_wrk), GFP_NOWAIT);\n" " \tif (!dr_wrk)\n" - "@@ -1756,11 +1757,23 @@ static void hv_pci_devices_present(struct hv_pcibus=\n" - "_device *hbus,\n" + "@@ -1756,11 +1757,23 @@ static void hv_pci_devices_present(struct hv_pcibus_device *hbus,\n" " \t}\n" - "=20\n" + " \n" " \tspin_lock_irqsave(&hbus->device_list_lock, flags);\n" "+\n" "+\t/*\n" @@ -60,10 +58,10 @@ "+\t * which will see the new dr. Otherwise, we need to\n" "+\t * queue a new work.\n" "+\t */\n" - "+\tpending_dr =3D !list_empty(&hbus->dr_list);\n" + "+\tpending_dr = !list_empty(&hbus->dr_list);\n" " \tlist_add_tail(&dr->list_entry, &hbus->dr_list);\n" "-\tspin_unlock_irqrestore(&hbus->device_list_lock, flags);\n" - "=20\n" + " \n" "-\tget_hvpcibus(hbus);\n" "-\tqueue_work(hbus->wq, &dr_wrk->wrk);\n" "+\tif (pending_dr) {\n" @@ -75,9 +73,9 @@ "+\n" "+\tspin_unlock_irqrestore(&hbus->device_list_lock, flags);\n" " }\n" - "=20\n" + " \n" " /**\n" - "--=20\n" + "-- \n" 2.7.4 -b42c7412d87b45eeff3b89a6441f1992352a40a402b5a3c9f8e203f54620dd40 +ae0deed0aa2c3d6011d0dcad1e81faafbac4123d35d9274b2cc968246ec63bf6
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.