diff for duplicates of <20180305192134.32207-5-decui@microsoft.com> diff --git a/a/1.txt b/N1/1.txt index bf6e8aa..104be16 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,13 +21,12 @@ index aaee41faf55f..3a385212f666 100644 @@ -447,7 +447,6 @@ struct hv_pcibus_device { spinlock_t device_list_lock; /* Protect lists below */ void __iomem *cfg_addr; -=20 + - struct semaphore enum_sem; struct list_head resources_for_children; -=20 + struct list_head children; -@@ -1592,12 +1591,8 @@ static struct hv_pci_dev *get_pcichild_wslot(struct = -hv_pcibus_device *hbus, +@@ -1592,12 +1591,8 @@ static struct hv_pci_dev *get_pcichild_wslot(struct hv_pcibus_device *hbus, * It must also treat the omission of a previously observed device as * notification that the device no longer exists. * @@ -42,11 +41,10 @@ hv_pcibus_device *hbus, */ static void pci_devices_present_work(struct work_struct *work) { -@@ -1618,11 +1613,6 @@ static void pci_devices_present_work(struct work_str= -uct *work) -=20 +@@ -1618,11 +1613,6 @@ static void pci_devices_present_work(struct work_struct *work) + INIT_LIST_HEAD(&removed); -=20 + - if (down_interruptible(&hbus->enum_sem)) { - put_hvpcibus(hbus); - return; @@ -55,20 +53,18 @@ uct *work) /* Pull this off the queue and process it if it was the last one. */ spin_lock_irqsave(&hbus->device_list_lock, flags); while (!list_empty(&hbus->dr_list)) { -@@ -1639,7 +1629,6 @@ static void pci_devices_present_work(struct work_stru= -ct *work) +@@ -1639,7 +1629,6 @@ static void pci_devices_present_work(struct work_struct *work) spin_unlock_irqrestore(&hbus->device_list_lock, flags); -=20 + if (!dr) { - up(&hbus->enum_sem); put_hvpcibus(hbus); return; } -@@ -1726,7 +1715,6 @@ static void pci_devices_present_work(struct work_stru= -ct *work) +@@ -1726,7 +1715,6 @@ static void pci_devices_present_work(struct work_struct *work) break; } -=20 + - up(&hbus->enum_sem); put_hvpcibus(hbus); kfree(dr); @@ -79,7 +75,11 @@ ct *work) spin_lock_init(&hbus->retarget_msi_interrupt_lock); - sema_init(&hbus->enum_sem, 1); init_completion(&hbus->remove_event); - hbus->wq =3D alloc_ordered_workqueue("hv_pci_%x", 0, + hbus->wq = alloc_ordered_workqueue("hv_pci_%x", 0, hbus->sysdata.domain); ---=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 3a49285..0612c17 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" "Since we serialize the present/eject work items now, we don't need the\n" @@ -43,13 +42,12 @@ "@@ -447,7 +447,6 @@ struct hv_pcibus_device {\n" " \tspinlock_t device_list_lock;\t/* Protect lists below */\n" " \tvoid __iomem *cfg_addr;\n" - "=20\n" + " \n" "-\tstruct semaphore enum_sem;\n" " \tstruct list_head resources_for_children;\n" - "=20\n" + " \n" " \tstruct list_head children;\n" - "@@ -1592,12 +1591,8 @@ static struct hv_pci_dev *get_pcichild_wslot(struct =\n" - "hv_pcibus_device *hbus,\n" + "@@ -1592,12 +1591,8 @@ static struct hv_pci_dev *get_pcichild_wslot(struct hv_pcibus_device *hbus,\n" " * It must also treat the omission of a previously observed device as\n" " * notification that the device no longer exists.\n" " *\n" @@ -64,11 +62,10 @@ " */\n" " static void pci_devices_present_work(struct work_struct *work)\n" " {\n" - "@@ -1618,11 +1613,6 @@ static void pci_devices_present_work(struct work_str=\n" - "uct *work)\n" - "=20\n" + "@@ -1618,11 +1613,6 @@ static void pci_devices_present_work(struct work_struct *work)\n" + " \n" " \tINIT_LIST_HEAD(&removed);\n" - "=20\n" + " \n" "-\tif (down_interruptible(&hbus->enum_sem)) {\n" "-\t\tput_hvpcibus(hbus);\n" "-\t\treturn;\n" @@ -77,20 +74,18 @@ " \t/* Pull this off the queue and process it if it was the last one. */\n" " \tspin_lock_irqsave(&hbus->device_list_lock, flags);\n" " \twhile (!list_empty(&hbus->dr_list)) {\n" - "@@ -1639,7 +1629,6 @@ static void pci_devices_present_work(struct work_stru=\n" - "ct *work)\n" + "@@ -1639,7 +1629,6 @@ static void pci_devices_present_work(struct work_struct *work)\n" " \tspin_unlock_irqrestore(&hbus->device_list_lock, flags);\n" - "=20\n" + " \n" " \tif (!dr) {\n" "-\t\tup(&hbus->enum_sem);\n" " \t\tput_hvpcibus(hbus);\n" " \t\treturn;\n" " \t}\n" - "@@ -1726,7 +1715,6 @@ static void pci_devices_present_work(struct work_stru=\n" - "ct *work)\n" + "@@ -1726,7 +1715,6 @@ static void pci_devices_present_work(struct work_struct *work)\n" " \t\tbreak;\n" " \t}\n" - "=20\n" + " \n" "-\tup(&hbus->enum_sem);\n" " \tput_hvpcibus(hbus);\n" " \tkfree(dr);\n" @@ -101,9 +96,13 @@ " \tspin_lock_init(&hbus->retarget_msi_interrupt_lock);\n" "-\tsema_init(&hbus->enum_sem, 1);\n" " \tinit_completion(&hbus->remove_event);\n" - " \thbus->wq =3D alloc_ordered_workqueue(\"hv_pci_%x\", 0,\n" + " \thbus->wq = alloc_ordered_workqueue(\"hv_pci_%x\", 0,\n" " \t\t\t\t\t hbus->sysdata.domain);\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 -604f8f302b75346c585e1c38dcbc14aed47a600dd7ca224c3addacbbb7c5e4ed +12d6d811d60fa2aa84ee1cd0c4bcc673a494b659faf5798675fa0468a639c12f
diff --git a/a/1.txt b/N2/1.txt index bf6e8aa..1730f76 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -21,13 +21,12 @@ index aaee41faf55f..3a385212f666 100644 @@ -447,7 +447,6 @@ struct hv_pcibus_device { spinlock_t device_list_lock; /* Protect lists below */ void __iomem *cfg_addr; -=20 + - struct semaphore enum_sem; struct list_head resources_for_children; -=20 + struct list_head children; -@@ -1592,12 +1591,8 @@ static struct hv_pci_dev *get_pcichild_wslot(struct = -hv_pcibus_device *hbus, +@@ -1592,12 +1591,8 @@ static struct hv_pci_dev *get_pcichild_wslot(struct hv_pcibus_device *hbus, * It must also treat the omission of a previously observed device as * notification that the device no longer exists. * @@ -42,11 +41,10 @@ hv_pcibus_device *hbus, */ static void pci_devices_present_work(struct work_struct *work) { -@@ -1618,11 +1613,6 @@ static void pci_devices_present_work(struct work_str= -uct *work) -=20 +@@ -1618,11 +1613,6 @@ static void pci_devices_present_work(struct work_struct *work) + INIT_LIST_HEAD(&removed); -=20 + - if (down_interruptible(&hbus->enum_sem)) { - put_hvpcibus(hbus); - return; @@ -55,20 +53,18 @@ uct *work) /* Pull this off the queue and process it if it was the last one. */ spin_lock_irqsave(&hbus->device_list_lock, flags); while (!list_empty(&hbus->dr_list)) { -@@ -1639,7 +1629,6 @@ static void pci_devices_present_work(struct work_stru= -ct *work) +@@ -1639,7 +1629,6 @@ static void pci_devices_present_work(struct work_struct *work) spin_unlock_irqrestore(&hbus->device_list_lock, flags); -=20 + if (!dr) { - up(&hbus->enum_sem); put_hvpcibus(hbus); return; } -@@ -1726,7 +1715,6 @@ static void pci_devices_present_work(struct work_stru= -ct *work) +@@ -1726,7 +1715,6 @@ static void pci_devices_present_work(struct work_struct *work) break; } -=20 + - up(&hbus->enum_sem); put_hvpcibus(hbus); kfree(dr); @@ -79,7 +75,7 @@ ct *work) spin_lock_init(&hbus->retarget_msi_interrupt_lock); - sema_init(&hbus->enum_sem, 1); init_completion(&hbus->remove_event); - hbus->wq =3D alloc_ordered_workqueue("hv_pci_%x", 0, + hbus->wq = alloc_ordered_workqueue("hv_pci_%x", 0, hbus->sysdata.domain); ---=20 +-- 2.7.4 diff --git a/a/content_digest b/N2/content_digest index 3a49285..1589b3e 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -43,13 +43,12 @@ "@@ -447,7 +447,6 @@ struct hv_pcibus_device {\n" " \tspinlock_t device_list_lock;\t/* Protect lists below */\n" " \tvoid __iomem *cfg_addr;\n" - "=20\n" + " \n" "-\tstruct semaphore enum_sem;\n" " \tstruct list_head resources_for_children;\n" - "=20\n" + " \n" " \tstruct list_head children;\n" - "@@ -1592,12 +1591,8 @@ static struct hv_pci_dev *get_pcichild_wslot(struct =\n" - "hv_pcibus_device *hbus,\n" + "@@ -1592,12 +1591,8 @@ static struct hv_pci_dev *get_pcichild_wslot(struct hv_pcibus_device *hbus,\n" " * It must also treat the omission of a previously observed device as\n" " * notification that the device no longer exists.\n" " *\n" @@ -64,11 +63,10 @@ " */\n" " static void pci_devices_present_work(struct work_struct *work)\n" " {\n" - "@@ -1618,11 +1613,6 @@ static void pci_devices_present_work(struct work_str=\n" - "uct *work)\n" - "=20\n" + "@@ -1618,11 +1613,6 @@ static void pci_devices_present_work(struct work_struct *work)\n" + " \n" " \tINIT_LIST_HEAD(&removed);\n" - "=20\n" + " \n" "-\tif (down_interruptible(&hbus->enum_sem)) {\n" "-\t\tput_hvpcibus(hbus);\n" "-\t\treturn;\n" @@ -77,20 +75,18 @@ " \t/* Pull this off the queue and process it if it was the last one. */\n" " \tspin_lock_irqsave(&hbus->device_list_lock, flags);\n" " \twhile (!list_empty(&hbus->dr_list)) {\n" - "@@ -1639,7 +1629,6 @@ static void pci_devices_present_work(struct work_stru=\n" - "ct *work)\n" + "@@ -1639,7 +1629,6 @@ static void pci_devices_present_work(struct work_struct *work)\n" " \tspin_unlock_irqrestore(&hbus->device_list_lock, flags);\n" - "=20\n" + " \n" " \tif (!dr) {\n" "-\t\tup(&hbus->enum_sem);\n" " \t\tput_hvpcibus(hbus);\n" " \t\treturn;\n" " \t}\n" - "@@ -1726,7 +1715,6 @@ static void pci_devices_present_work(struct work_stru=\n" - "ct *work)\n" + "@@ -1726,7 +1715,6 @@ static void pci_devices_present_work(struct work_struct *work)\n" " \t\tbreak;\n" " \t}\n" - "=20\n" + " \n" "-\tup(&hbus->enum_sem);\n" " \tput_hvpcibus(hbus);\n" " \tkfree(dr);\n" @@ -101,9 +97,9 @@ " \tspin_lock_init(&hbus->retarget_msi_interrupt_lock);\n" "-\tsema_init(&hbus->enum_sem, 1);\n" " \tinit_completion(&hbus->remove_event);\n" - " \thbus->wq =3D alloc_ordered_workqueue(\"hv_pci_%x\", 0,\n" + " \thbus->wq = alloc_ordered_workqueue(\"hv_pci_%x\", 0,\n" " \t\t\t\t\t hbus->sysdata.domain);\n" - "--=20\n" + "-- \n" 2.7.4 -604f8f302b75346c585e1c38dcbc14aed47a600dd7ca224c3addacbbb7c5e4ed +4af7050f0009d501f0cee96d6de6a6dfc20ec9ea4a29d6a9baf7beb4ad1ba49c
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.