Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-06-14 20:34:00 +0200
committerTakashi Iwai <tiwai@suse.de>2019-06-14 20:34:04 +0200
commitd586254a8b25b6a3d5a75da5d3d9e7e3c089553a (patch)
treebdb5bc6f68a9788cdb57a5f53e69d84bf65f4926
parent759d72fb45ac2fd9700a10cf6b6bd99eaad83632 (diff)
kABI workaround for the new pci_dev.skip_bus_pm field addition
(bsc#1051510).
-rw-r--r--patches.kabi/PCI-skip_bus_pm-kabi-fix.patch31
-rw-r--r--series.conf1
2 files changed, 32 insertions, 0 deletions
diff --git a/patches.kabi/PCI-skip_bus_pm-kabi-fix.patch b/patches.kabi/PCI-skip_bus_pm-kabi-fix.patch
new file mode 100644
index 0000000000..26ee2fa993
--- /dev/null
+++ b/patches.kabi/PCI-skip_bus_pm-kabi-fix.patch
@@ -0,0 +1,31 @@
+From: Takashi Iwai <tiwai@suse.de>
+Subject: kABI workaround for the new pci_dev.skip_bus_pm field addition
+Patch-mainline: Never, kABI workaround for SLE15 & co
+References: bsc#1051510
+
+A standard idiom to move the newly added bitfild to the unused position.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ include/linux/pci.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/linux/pci.h
++++ b/include/linux/pci.h
+@@ -324,7 +324,6 @@ struct pci_dev {
+ D3cold, not set for devices
+ powered on/off by the
+ corresponding bridge */
+- unsigned int skip_bus_pm:1; /* Internal: Skip bus-level PM */
+ unsigned int ignore_hotplug:1; /* Ignore hotplug events */
+ unsigned int hotplug_user_indicators:1; /* SlotCtl indicators
+ controlled exclusively by
+@@ -332,6 +331,7 @@ struct pci_dev {
+ #ifndef __GENKSYMS__
+ unsigned int clear_retrain_link:1; /* Need to clear Retrain Link
+ bit manually */
++ unsigned int skip_bus_pm:1; /* Internal: Skip bus-level PM */
+ #endif
+ unsigned int d3_delay; /* D3->D0 transition time in ms */
+ unsigned int d3cold_delay; /* D3cold->D0 transition time in ms */
diff --git a/series.conf b/series.conf
index 5fcfd6d5b5..dd80a2dba4 100644
--- a/series.conf
+++ b/series.conf
@@ -23222,6 +23222,7 @@
patches.kabi/fs-prevent-page-refcount-overflow-in-pipe_buf_get-kabi.patch
patches.kabi/kabi-protect-dma-mapping-h-include.patch
patches.kabi/kabi-protect-struct-pci_dev.patch
+ patches.kabi/PCI-skip_bus_pm-kabi-fix.patch
patches.kabi/memcg-make-it-work-on-sparse-non-0-node-systems-kabi.patch
########################################################