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:59:14 +0100
commitaada41949bee07da53bd6ee7ca677fefc2a3b975 (patch)
tree2df21093fa52ebdc712870a352100f6c6390debd
parent7126d23a8e7e4dca5e5cd9ac37e5b2a263b5d77c (diff)
kABI: protect linux/kfifo.h include in hid-debug (kabi).
-rw-r--r--patches.kabi/kabi-protect-kfifo-include-in-hid-debug.patch42
-rw-r--r--series.conf1
2 files changed, 43 insertions, 0 deletions
diff --git a/patches.kabi/kabi-protect-kfifo-include-in-hid-debug.patch b/patches.kabi/kabi-protect-kfifo-include-in-hid-debug.patch
new file mode 100644
index 0000000000..b489dad6f2
--- /dev/null
+++ b/patches.kabi/kabi-protect-kfifo-include-in-hid-debug.patch
@@ -0,0 +1,42 @@
+From: Jiri Slaby <jslaby@suse.cz>
+Subject: kABI: protect linux/kfifo.h include in hid-debug
+Patch-mainline: never, kabi
+References: kabi
+
+In 4.4.175, commit b661fff5f8a0f19824df91cc3905ba2c5b54dc87 (HID:
+debug: fix the ring buffer implementation), upstream commit
+13054abbaa4f1fd4e6f3b4b63439ec033b4c8035 added linux/kfifo.h include
+to hid-debug.c and it made some of the symbols defined.
+
+Protect the include by __GENKSYMS__ to satisfy the kABI checker.
+
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ drivers/hid/hid-debug.c | 2 ++
+ include/linux/hid-debug.h | 2 ++
+ 2 files changed, 4 insertions(+)
+
+--- a/drivers/hid/hid-debug.c
++++ b/drivers/hid/hid-debug.c
+@@ -30,7 +30,9 @@
+
+ #include <linux/debugfs.h>
+ #include <linux/seq_file.h>
++#ifndef __GENKSYMS__
+ #include <linux/kfifo.h>
++#endif
+ #include <linux/sched.h>
+ #include <linux/export.h>
+ #include <linux/slab.h>
+--- a/include/linux/hid-debug.h
++++ b/include/linux/hid-debug.h
+@@ -24,7 +24,9 @@
+
+ #ifdef CONFIG_DEBUG_FS
+
++#ifndef __GENKSYMS__
+ #include <linux/kfifo.h>
++#endif
+
+ #define HID_DEBUG_BUFSIZE 512
+ #define HID_DEBUG_FIFOSIZE 512
diff --git a/series.conf b/series.conf
index f2bb845a98..883bcca1d9 100644
--- a/series.conf
+++ b/series.conf
@@ -25802,6 +25802,7 @@
patches.kabi/bpf-ssbd-removal-workaround.patch
patches.kabi/fix-kvm-kabi.patch
patches.kabi/kabi-protect-struct-hda_bus.patch
+ patches.kabi/kabi-protect-kfifo-include-in-hid-debug.patch
# bsc#1114417
patches.suse/hpwdt-calculate-reload-each-use.patch