On Tue, Aug 09, 2016 at 11:53:11AM +0200, Lukas Wunner wrote:
> Commit 2b94ed245861 ("kexec: define kexec_in_progress in !CONFIG_KEXEC
> case") has made this unnecessary.
>
> Signed-off-by: Lukas Wunner <lukas@xxxxxxxxx>
Applied to pci/misc for v4.9, thanks, Lukas!
> ---
> drivers/pci/pci-driver.c | 2 --
> 1 file changed, 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
> --
> 2.8.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
