From: Greg Kroah-Hartman Date: Thu, 16 Mar 2023 07:57:03 +0000 (+0100) Subject: drop queue-5.10/pci-pm-define-pci_restore_standard_config-only-for-c.patch X-Git-Tag: v4.14.310~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2831dc5a0ada0a585873b54fcf2478aa565e83af;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-5.10/pci-pm-define-pci_restore_standard_config-only-for-c.patch Broke the build and the patch it was requried for isn't in the tree! --- diff --git a/queue-5.10/pci-pm-define-pci_restore_standard_config-only-for-c.patch b/queue-5.10/pci-pm-define-pci_restore_standard_config-only-for-c.patch deleted file mode 100644 index 6c3292365dd..00000000000 --- a/queue-5.10/pci-pm-define-pci_restore_standard_config-only-for-c.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 6c5b3fa19f734213cada7f27fd08027ea142f5bf Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 20 Apr 2022 16:11:35 +0200 -Subject: PCI/PM: Define pci_restore_standard_config() only for CONFIG_PM_SLEEP -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Krzysztof Kozlowski - -[ Upstream commit 18a94192e20de31e7e495d7c805c8930c42e99ef ] - -pci_restore_standard_config() was defined under CONFIG_PM but called only -by pci_pm_resume() (defined under CONFIG_SUSPEND) and pci_pm_restore() -(defined under CONFIG_HIBERNATE_CALLBACKS). A configuration with only -CONFIG_PM leads to a warning: - - drivers/pci/pci-driver.c:533:12: error: ‘pci_restore_standard_config’ defined but not used [-Werror=unused-function] - -CONFIG_PM_SLEEP depends on CONFIG_SUSPEND and CONFIG_HIBERNATE_CALLBACKS, -so define pci_restore_standard_config() under that instead. - -Link: https://lore.kernel.org/r/20220420141135.444820-1-krzysztof.kozlowski@linaro.org -Signed-off-by: Krzysztof Kozlowski -Signed-off-by: Bjorn Helgaas -Stable-dep-of: ac91e6980563 ("PCI: Unify delay handling for reset and resume") -Signed-off-by: Sasha Levin ---- - drivers/pci/pci-driver.c | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c -index 8b587fc97f7bc..bbaecc2340371 100644 ---- a/drivers/pci/pci-driver.c -+++ b/drivers/pci/pci-driver.c -@@ -499,9 +499,9 @@ static void pci_device_shutdown(struct device *dev) - pci_clear_master(pci_dev); - } - --#ifdef CONFIG_PM -+#ifdef CONFIG_PM_SLEEP - --/* Auxiliary functions used for system resume and run-time resume. */ -+/* Auxiliary functions used for system resume */ - - /** - * pci_restore_standard_config - restore standard config registers of PCI device -@@ -521,6 +521,11 @@ static int pci_restore_standard_config(struct pci_dev *pci_dev) - pci_pme_restore(pci_dev); - return 0; - } -+#endif /* CONFIG_PM_SLEEP */ -+ -+#ifdef CONFIG_PM -+ -+/* Auxiliary functions used for system resume and run-time resume */ - - static void pci_pm_default_resume(struct pci_dev *pci_dev) - { -@@ -528,10 +533,6 @@ static void pci_pm_default_resume(struct pci_dev *pci_dev) - pci_enable_wake(pci_dev, PCI_D0, false); - } - --#endif -- --#ifdef CONFIG_PM_SLEEP -- - static void pci_pm_default_resume_early(struct pci_dev *pci_dev) - { - pci_power_up(pci_dev); -@@ -540,6 +541,10 @@ static void pci_pm_default_resume_early(struct pci_dev *pci_dev) - pci_pme_restore(pci_dev); - } - -+#endif /* CONFIG_PM */ -+ -+#ifdef CONFIG_PM_SLEEP -+ - /* - * Default "suspend" method for devices that have no driver provided suspend, - * or not even a driver at all (second part). --- -2.39.2 - diff --git a/queue-5.10/series b/queue-5.10/series index 37080f9b619..a9eb1a9af53 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -55,7 +55,6 @@ riscv-use-read_once_nocheck-in-imprecise-unwinding-s.patch risc-v-don-t-check-text_mutex-during-stop_machine.patch ext4-fix-deadlock-during-directory-rename.patch iommu-amd-add-a-length-limitation-for-the-ivrs_acpih.patch -pci-pm-define-pci_restore_standard_config-only-for-c.patch watch_queue-fix-ioc_watch_queue_set_size-alloc-error.patch tpm-eventlog-don-t-abort-tpm_read_log-on-faulty-acpi.patch block-bfq-fix-possible-uaf-for-bfqq-bic.patch