From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Johannes Berg <johannes.berg@intel.com>,
Nick Desaulniers <ndesaulniers@google.com>,
Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Sasha Levin <sashal@kernel.org>,
clang-built-linux@googlegroups.com
Subject: [PATCH AUTOSEL 5.4 13/14] gcov: clang: fix clang-11+ build
Date: Mon, 19 Apr 2021 16:44:53 -0400 [thread overview]
Message-ID: <20210419204454.6601-13-sashal@kernel.org> (raw)
In-Reply-To: <20210419204454.6601-1-sashal@kernel.org>
From: Johannes Berg <johannes.berg@intel.com>
[ Upstream commit 04c53de57cb6435738961dace8b1b71d3ecd3c39 ]
With clang-11+, the code is broken due to my kvmalloc() conversion
(which predated the clang-11 support code) leaving one vmalloc() in
place. Fix that.
Link: https://lkml.kernel.org/r/20210412214210.6e1ecca9cdc5.I24459763acf0591d5e6b31c7e3a59890d802f79c@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Tested-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
kernel/gcov/clang.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/gcov/clang.c b/kernel/gcov/clang.c
index c466c7fbdece..b81f2823630d 100644
--- a/kernel/gcov/clang.c
+++ b/kernel/gcov/clang.c
@@ -369,7 +369,7 @@ static struct gcov_fn_info *gcov_fn_info_dup(struct gcov_fn_info *fn)
INIT_LIST_HEAD(&fn_dup->head);
cv_size = fn->num_counters * sizeof(fn->counters[0]);
- fn_dup->counters = vmalloc(cv_size);
+ fn_dup->counters = kvmalloc(cv_size, GFP_KERNEL);
if (!fn_dup->counters) {
kfree(fn_dup);
return NULL;
--
2.30.2
next prev parent reply other threads:[~2021-04-19 20:48 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-19 20:44 [PATCH AUTOSEL 5.4 01/14] HID: google: add don USB id Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.4 02/14] HID: alps: fix error return code in alps_input_configured() Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.4 03/14] HID: wacom: Assign boolean values to a bool variable Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.4 04/14] ARM: dts: Fix swapped mmc order for omap3 Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.4 05/14] net: geneve: check skb is large enough for IPv4/IPv6 header Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.4 06/14] s390/entry: save the caller of psw_idle Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.4 07/14] xen-netback: Check for hotplug-status existence before watching Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.4 08/14] cavium/liquidio: Fix duplicate argument Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.4 09/14] i2c: mv64xxx: Fix random system lock caused by runtime PM Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.4 10/14] csky: change a Kconfig symbol name to fix e1000 build error Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.4 11/14] ia64: fix discontig.c section mismatches Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.4 12/14] ia64: tools: remove duplicate definition of ia64_mf() on ia64 Sasha Levin
2021-04-19 20:44 ` Sasha Levin [this message]
2021-04-20 7:01 ` [PATCH AUTOSEL 5.4 13/14] gcov: clang: fix clang-11+ build Johannes Berg
2021-04-20 14:11 ` Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.4 14/14] readdir: make sure to verify directory entry for legacy interfaces too Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210419204454.6601-13-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=clang-built-linux@googlegroups.com \
--cc=johannes.berg@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=ndesaulniers@google.com \
--cc=stable@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox