From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 7 May 2019 12:50:18 +0000 (+0200)
Subject: 4.14-stable patches
X-Git-Tag: v4.9.174~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a56c1cdee28490265bf30d7e6753afb6a35ff848;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	mm-kmemleak.c-fix-unused-function-warning.patch
---

diff --git a/queue-4.14/mm-kmemleak.c-fix-unused-function-warning.patch b/queue-4.14/mm-kmemleak.c-fix-unused-function-warning.patch
new file mode 100644
index 00000000000..9ede1fd0b1e
--- /dev/null
+++ b/queue-4.14/mm-kmemleak.c-fix-unused-function-warning.patch
@@ -0,0 +1,49 @@
+From dce5b0bdeec61bdbee56121ceb1d014151d5cab1 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Thu, 18 Apr 2019 17:50:48 -0700
+Subject: mm/kmemleak.c: fix unused-function warning
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+commit dce5b0bdeec61bdbee56121ceb1d014151d5cab1 upstream.
+
+The only references outside of the #ifdef have been removed, so now we
+get a warning in non-SMP configurations:
+
+  mm/kmemleak.c:1404:13: error: unused function 'scan_large_block' [-Werror,-Wunused-function]
+
+Add a new #ifdef around it.
+
+Link: http://lkml.kernel.org/r/20190416123148.3502045-1-arnd@arndb.de
+Fixes: 298a32b13208 ("kmemleak: powerpc: skip scanning holes in the .bss section")
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Acked-by: Catalin Marinas <catalin.marinas@arm.com>
+Cc: Vincent Whitchurch <vincent.whitchurch@axis.com>
+Cc: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ mm/kmemleak.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/mm/kmemleak.c
++++ b/mm/kmemleak.c
+@@ -1364,6 +1364,7 @@ static void scan_block(void *_start, voi
+ /*
+  * Scan a large memory block in MAX_SCAN_SIZE chunks to reduce the latency.
+  */
++#ifdef CONFIG_SMP
+ static void scan_large_block(void *start, void *end)
+ {
+ 	void *next;
+@@ -1375,6 +1376,7 @@ static void scan_large_block(void *start
+ 		cond_resched();
+ 	}
+ }
++#endif
+ 
+ /*
+  * Scan a memory block corresponding to a kmemleak_object. A condition is
diff --git a/queue-4.14/series b/queue-4.14/series
index 802af3bcaba..5168bc4a70e 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -73,3 +73,4 @@ x86-mce-improve-error-message-when-kernel-cannot-recover-p2.patch
 clk-x86-add-system-specific-quirk-to-mark-clocks-as-critical.patch
 i2c-i2c-stm32f7-fix-sdadel-minimum-formula.patch
 media-v4l2-i2c-ov7670-fix-pll-bypass-register-values.patch
+mm-kmemleak.c-fix-unused-function-warning.patch