40 lines
1.8 KiB
Diff
40 lines
1.8 KiB
Diff
|
diff -Naur drbd-9.0.20~1+git.7dce3c8b.orig/drbd/drbd-kernel-compat/cocci/suse_pr_warning__no_present.cocci drbd-9.0.20~1+git.7dce3c8b/drbd/drbd-kernel-compat/cocci/suse_pr_warning__no_present.cocci
|
||
|
|
--- drbd-9.0.20~1+git.7dce3c8b.orig/drbd/drbd-kernel-compat/cocci/suse_pr_warning__no_present.cocci 1970-01-01 08:00:00.000000000 +0800
|
||
|
|
+++ drbd-9.0.20~1+git.7dce3c8b/drbd/drbd-kernel-compat/cocci/suse_pr_warning__no_present.cocci 2020-01-03 16:27:11.508386084 +0800
|
||
|
|
@@ -0,0 +1,10 @@
|
||
|
|
+@outdate_pr_waring@
|
||
|
|
+identifier func;
|
||
|
|
+@@
|
||
|
|
+func(...) {
|
||
|
|
+<...
|
||
|
|
+- pr_warning
|
||
|
|
++ pr_warn
|
||
|
|
+...>
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
diff -Naur drbd-9.0.20~1+git.7dce3c8b.orig/drbd/drbd-kernel-compat/gen_patch_names.c drbd-9.0.20~1+git.7dce3c8b/drbd/drbd-kernel-compat/gen_patch_names.c
|
||
|
|
--- drbd-9.0.20~1+git.7dce3c8b.orig/drbd/drbd-kernel-compat/gen_patch_names.c 2019-12-26 17:01:19.647961356 +0800
|
||
|
|
+++ drbd-9.0.20~1+git.7dce3c8b/drbd/drbd-kernel-compat/gen_patch_names.c 2020-01-03 16:31:30.077789676 +0800
|
||
|
|
@@ -291,6 +291,9 @@
|
||
|
|
patch(1, "allow_kernel_signal", true, false,
|
||
|
|
COMPAT_HAVE_ALLOW_KERNEL_SIGNAL, "present");
|
||
|
|
|
||
|
|
+ patch(1, "suse_pr_warning", true, false,
|
||
|
|
+ COMPAT_WITH_PR_WARNING, "present");
|
||
|
|
+
|
||
|
|
/* #define BLKDEV_ISSUE_ZEROOUT_EXPORTED */
|
||
|
|
/* #define BLKDEV_ZERO_NOUNMAP */
|
||
|
|
|
||
|
|
diff -Naur drbd-9.0.20~1+git.7dce3c8b.orig/drbd/drbd-kernel-compat/tests/with_pr_warning.c drbd-9.0.20~1+git.7dce3c8b/drbd/drbd-kernel-compat/tests/with_pr_warning.c
|
||
|
|
--- drbd-9.0.20~1+git.7dce3c8b.orig/drbd/drbd-kernel-compat/tests/with_pr_warning.c 1970-01-01 08:00:00.000000000 +0800
|
||
|
|
+++ drbd-9.0.20~1+git.7dce3c8b/drbd/drbd-kernel-compat/tests/with_pr_warning.c 2019-12-26 17:52:57.761698224 +0800
|
||
|
|
@@ -0,0 +1,8 @@
|
||
|
|
+#include <linux/printk.h>
|
||
|
|
+
|
||
|
|
+/* pr_waring is dropped since 61ff72f401680 */
|
||
|
|
+
|
||
|
|
+void foo(void)
|
||
|
|
+{
|
||
|
|
+ pr_warning("pr_warning replaced by pr_warn since 61ff72f401680!");
|
||
|
|
+}
|