korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-30 15:44:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

PCI: Drop CONFIG_KEXEC_CORE ifdeffery

Browse Source 
Drop the CONFIG_KEXEC_CORE #ifdef around reference to "kexec_in_progress".

Commit 2b94ed2458 ("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>
This commit is contained in:
Lukas Wunner 2016-08-09 11:53:11 +02:00 committed by Bjorn Helgaas
parent 29b4817d40
commit ad618c9983
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pci/pci-driver.c
View File

@ -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)
*/ */
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