From: Bjorn Helgaas <helgaas@kernel.org>
To: Lukas Wunner <lukas@wunner.de>
Cc: linux-pci@vger.kernel.org
Subject: Re: [PATCH] PCI: Drop CONFIG_KEXEC_CORE ifdeffery
Date: Tue, 9 Aug 2016 11:57:17 -0500 [thread overview]
Message-ID: <20160809165717.GC27301@localhost> (raw)
In-Reply-To: <0be33af4eef7e2ef328360c3622bb0581e69f437.1470735088.git.lukas@wunner.de>
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@wunner.de>
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@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
prev parent reply other threads:[~2016-08-09 16:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-09 9:53 [PATCH] PCI: Drop CONFIG_KEXEC_CORE ifdeffery Lukas Wunner
2016-08-09 16:57 ` Bjorn Helgaas [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160809165717.GC27301@localhost \
--to=helgaas@kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lukas@wunner.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).