diff options
| author | Lukas Wunner <lukas@wunner.de> | 2016-08-09 11:53:11 +0200 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-08-09 11:56:04 -0500 |
| commit | ad618c9983be3136e9e7209ffd7c4102720d0739 (patch) | |
| tree | 600aa01433bf6200f013fe70d32d960cff4d4629 /drivers/pci/pci-driver.c | |
| parent | 29b4817d4018df78086157ea3a55c1d9424a7cfc (diff) | |
| download | op-kernel-dev-ad618c9983be3136e9e7209ffd7c4102720d0739.zip op-kernel-dev-ad618c9983be3136e9e7209ffd7c4102720d0739.tar.gz | |
PCI: Drop CONFIG_KEXEC_CORE ifdeffery
Drop the CONFIG_KEXEC_CORE #ifdef around reference to "kexec_in_progress".
Commit 2b94ed245861 ("kexec: define kexec_in_progress in !CONFIG_KEXEC
case") has made this unnecessary.
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/pci-driver.c')
| -rw-r--r-- | drivers/pci/pci-driver.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index e39a67c..edd78e0 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -466,7 +466,6 @@ static void pci_device_shutdown(struct device *dev) pci_msi_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 * 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) */ if (kexec_in_progress && (pci_dev->current_state <= PCI_D3hot)) pci_clear_master(pci_dev); -#endif } #ifdef CONFIG_PM |
