Skip to content

L
linux
Commit 5485e49f authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files
Options

Merge branch 'pci/misc' into next 

* pci/misc:
  PCI: Drop CONFIG_KEXEC_CORE ifdeffery
parents 64ea3b99 ad618c99
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
drivers/pci/pci-driver.c
View file @ 5485e49f
...@@ -466,7 +466,6 @@ static void pci_device_shutdown(struct device *dev) ...@@ -466,7 +466,6 @@ static void pci_device_shutdown(struct device *dev)
pci_msi_shutdown(pci_dev); pci_msi_shutdown(pci_dev);
pci_msix_shutdown(pci_dev); pci_msix_shutdown(pci_dev);
#ifdef CONFIG_KEXEC_CORE
/* /*
* If this is a kexec reboot, turn off Bus Master bit on the * If this is a kexec reboot, turn off Bus Master bit on the
* device to tell it to not continue to do DMA. Don't touch * device to tell it to not continue to do DMA. Don't touch
...@@ -476,7 +475,6 @@ static void pci_device_shutdown(struct device *dev) ...@@ -476,7 +475,6 @@ static void pci_device_shutdown(struct device *dev)
*/ */
if (kexec_in_progress && (pci_dev->current_state <= PCI_D3hot)) if (kexec_in_progress && (pci_dev->current_state <= PCI_D3hot))
pci_clear_master(pci_dev); pci_clear_master(pci_dev);
#endif
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7