From: Sasha Levin Date: Wed, 11 Sep 2019 09:26:12 +0000 (-0400) Subject: fixes for 4.9 X-Git-Tag: v4.4.193~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e58e8150a85f2ae009f557eab80b7b28f03a52f9;p=thirdparty%2Fkernel%2Fstable-queue.git fixes for 4.9 Signed-off-by: Sasha Levin --- diff --git a/queue-4.9/clk-s2mps11-add-used-attribute-to-s2mps11_dt_match.patch b/queue-4.9/clk-s2mps11-add-used-attribute-to-s2mps11_dt_match.patch new file mode 100644 index 00000000000..b0bb4bd928d --- /dev/null +++ b/queue-4.9/clk-s2mps11-add-used-attribute-to-s2mps11_dt_match.patch @@ -0,0 +1,62 @@ +From a0881dca366859ad306b6b2b6d064df5444c4b27 Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Thu, 18 Oct 2018 12:13:40 -0700 +Subject: clk: s2mps11: Add used attribute to s2mps11_dt_match + +[ Upstream commit 9c940bbe2bb47e03ca5e937d30b6a50bf9c0e671 ] + +Clang warns after commit 8985167ecf57 ("clk: s2mps11: Fix matching when +built as module and DT node contains compatible"): + +drivers/clk/clk-s2mps11.c:242:34: warning: variable 's2mps11_dt_match' +is not needed and will not be emitted [-Wunneeded-internal-declaration] +static const struct of_device_id s2mps11_dt_match[] = { + ^ +1 warning generated. + +This warning happens when a variable is used in some construct that +doesn't require a reference to that variable to be emitted in the symbol +table; in this case, it's MODULE_DEVICE_TABLE, which only needs to hold +the data of the variable, not the variable itself. + +$ nm -S drivers/clk/clk-s2mps11.o | rg s2mps11_dt_match +00000078 000003d4 R __mod_of__s2mps11_dt_match_device_table + +Normally, with device ID table variables, it means that the variable +just needs to be tied to the device declaration at the bottom of the +file, like s2mps11_clk_id: + +$ nm -S drivers/clk/clk-s2mps11.o | rg s2mps11_clk_id +00000000 00000078 R __mod_platform__s2mps11_clk_id_device_table +00000000 00000078 r s2mps11_clk_id + +However, because the comment above this deliberately doesn't want this +variable added to .of_match_table, we need to mark s2mps11_dt_match as +__used to silence this warning. This makes it clear to Clang that the +variable is used for something, even if a reference to it isn't being +emitted. + +Signed-off-by: Nathan Chancellor +Fixes: 8985167ecf57 ("clk: s2mps11: Fix matching when built as module and DT node contains compatible") +Signed-off-by: Stephen Boyd +Signed-off-by: Sasha Levin +--- + drivers/clk/clk-s2mps11.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/clk/clk-s2mps11.c b/drivers/clk/clk-s2mps11.c +index 14071a57c9262..f5d74e8db4327 100644 +--- a/drivers/clk/clk-s2mps11.c ++++ b/drivers/clk/clk-s2mps11.c +@@ -255,7 +255,7 @@ MODULE_DEVICE_TABLE(platform, s2mps11_clk_id); + * This requires of_device_id table. In the same time this will not change the + * actual *device* matching so do not add .of_match_table. + */ +-static const struct of_device_id s2mps11_dt_match[] = { ++static const struct of_device_id s2mps11_dt_match[] __used = { + { + .compatible = "samsung,s2mps11-clk", + .data = (void *)S2MPS11X, +-- +2.20.1 + diff --git a/queue-4.9/scripts-decode_stacktrace-match-basepath-using-shell.patch b/queue-4.9/scripts-decode_stacktrace-match-basepath-using-shell.patch new file mode 100644 index 00000000000..4e40978213a --- /dev/null +++ b/queue-4.9/scripts-decode_stacktrace-match-basepath-using-shell.patch @@ -0,0 +1,38 @@ +From 36f33ce272679c7a3daceeac290debd59d550cce Mon Sep 17 00:00:00 2001 +From: Nicolas Boichat +Date: Thu, 11 Jul 2019 20:52:27 -0700 +Subject: scripts/decode_stacktrace: match basepath using shell prefix + operator, not regex + +[ Upstream commit 31013836a71e07751a6827f9d2ad41ef502ddaff ] + +The basepath may contain special characters, which would confuse the regex +matcher. ${var#prefix} does the right thing. + +Link: http://lkml.kernel.org/r/20190518055946.181563-1-drinkcat@chromium.org +Fixes: 67a28de47faa8358 ("scripts/decode_stacktrace: only strip base path when a prefix of the path") +Signed-off-by: Nicolas Boichat +Reviewed-by: Stephen Boyd +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + scripts/decode_stacktrace.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/decode_stacktrace.sh b/scripts/decode_stacktrace.sh +index 381acfc4c59dd..98cf6343afcd7 100755 +--- a/scripts/decode_stacktrace.sh ++++ b/scripts/decode_stacktrace.sh +@@ -77,7 +77,7 @@ parse_symbol() { + fi + + # Strip out the base of the path +- code=${code//^$basepath/""} ++ code=${code#$basepath/} + + # In the case of inlines, move everything to same line + code=${code//$'\n'/' '} +-- +2.20.1 + diff --git a/queue-4.9/series b/queue-4.9/series index 9c506baa3b2..ae4eb4b8989 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -8,3 +8,5 @@ ip6-fix-skb-leak-in-ip6frag_expire_frag_queue.patch vhost-test-fix-build-for-vhost-test.patch batman-adv-fix-uninit-value-in-batadv_netlink_get_ifindex.patch batman-adv-only-read-ogm-tvlv_len-after-buffer-len-check.patch +scripts-decode_stacktrace-match-basepath-using-shell.patch +clk-s2mps11-add-used-attribute-to-s2mps11_dt_match.patch