From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 30 Oct 2017 08:55:24 +0000 (+0100)
Subject: 4.13-stable patches
X-Git-Tag: v3.18.79~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=34048cc70721cc53f06339e925edfdc77b74831f;p=thirdparty%2Fkernel%2Fstable-queue.git

4.13-stable patches

added patches:
	fix-tracing-sample-code-warning.patch
---

diff --git a/queue-4.13/fix-tracing-sample-code-warning.patch b/queue-4.13/fix-tracing-sample-code-warning.patch
new file mode 100644
index 00000000000..f5dec7fc022
--- /dev/null
+++ b/queue-4.13/fix-tracing-sample-code-warning.patch
@@ -0,0 +1,35 @@
+From a0cb2b5c390151837b08e5f7bca4a6ecddbcd39c Mon Sep 17 00:00:00 2001
+From: Linus Torvalds <torvalds@linux-foundation.org>
+Date: Fri, 27 Oct 2017 20:35:31 -0700
+Subject: Fix tracing sample code warning.
+
+From: Linus Torvalds <torvalds@linux-foundation.org>
+
+commit a0cb2b5c390151837b08e5f7bca4a6ecddbcd39c upstream.
+
+Commit 6575257c60e1 ("tracing/samples: Fix creation and deletion of
+simple_thread_fn creation") introduced a new warning due to using a
+boolean as a counter.
+
+Just make it "int".
+
+Fixes: 6575257c60e1 ("tracing/samples: Fix creation and deletion of simple_thread_fn creation")
+Cc: Steven Rostedt <rostedt@goodmis.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ samples/trace_events/trace-events-sample.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/samples/trace_events/trace-events-sample.c
++++ b/samples/trace_events/trace-events-sample.c
+@@ -78,7 +78,7 @@ static int simple_thread_fn(void *arg)
+ }
+ 
+ static DEFINE_MUTEX(thread_mutex);
+-static bool simple_thread_cnt;
++static int simple_thread_cnt;
+ 
+ int foo_bar_reg(void)
+ {
diff --git a/queue-4.13/series b/queue-4.13/series
index 668080aebd5..7b212523f99 100644
--- a/queue-4.13/series
+++ b/queue-4.13/series
@@ -3,3 +3,4 @@ nvme-fc-fix-iowait-hang.patch
 alsa-hda-realtek-add-support-for-alc236-alc3204.patch
 alsa-hda-fix-headset-mic-problem-for-dell-machines-with-alc236.patch
 ceph-unlock-dangling-spinlock-in-try_flush_caps.patch
+fix-tracing-sample-code-warning.patch