Home Home > GIT Browse > SLE12-SP3-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-02-20 15:31:23 +0100
committerJiri Slaby <jslaby@suse.cz>2019-02-20 15:31:33 +0100
commit7126d23a8e7e4dca5e5cd9ac37e5b2a263b5d77c (patch)
treea11eb9563a258335ba972f97c39e78f2eabfa44a
parent1fddd2c42dd380243700b5ee8d68e5d2a9949886 (diff)
kABI: protect struct hda_bus (kabi).
-rw-r--r--patches.kabi/kabi-protect-struct-hda_bus.patch30
-rw-r--r--series.conf1
2 files changed, 31 insertions, 0 deletions
diff --git a/patches.kabi/kabi-protect-struct-hda_bus.patch b/patches.kabi/kabi-protect-struct-hda_bus.patch
new file mode 100644
index 0000000000..b2ee7f97e5
--- /dev/null
+++ b/patches.kabi/kabi-protect-struct-hda_bus.patch
@@ -0,0 +1,30 @@
+From: Jiri Slaby <jslaby@suse.cz>
+Subject: kABI: protect struct hda_bus
+Patch-mainline: never, kabi
+References: kabi
+
+In 4.4.175, commit 71ce2e8957ff6eed31953f54a02fc3bd083f0d26 (ALSA: hda
+- Serialize codec registrations), upstream commit
+305a0ade180981686eec1f92aa6252a7c6ebb1cf added a bit to struct
+hda_bus. It made the kABI checker to complain.
+
+Given this is only an HDA's internal header, just hide the change from
+the kABI checker.
+
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ sound/pci/hda/hda_codec.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/sound/pci/hda/hda_codec.h
++++ b/sound/pci/hda/hda_codec.h
+@@ -68,7 +68,9 @@ struct hda_bus {
+ unsigned int response_reset:1; /* controller was reset */
+ unsigned int in_reset:1; /* during reset operation */
+ unsigned int no_response_fallback:1; /* don't fallback at RIRB error */
++#ifndef __GENKSYMS__
+ unsigned int bus_probing :1; /* during probing process */
++#endif
+
+ int primary_dig_out_type; /* primary digital out PCM type */
+ unsigned int mixer_assigned; /* codec addr for mixer name */
diff --git a/series.conf b/series.conf
index d8a5833cc8..f2bb845a98 100644
--- a/series.conf
+++ b/series.conf
@@ -25801,6 +25801,7 @@
patches.kabi/KVM-VMX-Work-around-kABI-breakage-in-enum-vmx_l1d_fl.patch
patches.kabi/bpf-ssbd-removal-workaround.patch
patches.kabi/fix-kvm-kabi.patch
+ patches.kabi/kabi-protect-struct-hda_bus.patch
# bsc#1114417
patches.suse/hpwdt-calculate-reload-each-use.patch