diff for duplicates of <20180306182128.23281-5-decui@microsoft.com> diff --git a/a/1.txt b/N1/1.txt index bf6e8aa..1730f76 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,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/N1/content_digest index 0e0d22e..6073411 100644 --- a/a/content_digest +++ b/N1/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 -e2e40a45aa2366d83887a7698bcbd19b3dea51f78ab05ceff56d33342dcfe407 +e8aee34c2df1ffb8885f44b6c069dd07fb32e8a868d17c5ea7eb3c539626de73
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.