Commit-ID: 2bc217c61685487987c5befd807e10936371643c Gitweb: https://git.kernel.org/tip/2bc217c61685487987c5befd807e10936371643c Author: Gustavo A. R. Silva <gust...@embeddedor.com> AuthorDate: Tue, 15 Jan 2019 11:37:13 -0600 Committer: Borislav Petkov <b...@suse.de> CommitDate: Wed, 16 Jan 2019 13:01:26 +0100
x86/platform/UV: Replace kmalloc() and memset() with k[cz]alloc() calls Replace kmalloc_node() and memset() with kzalloc_node(), and kmalloc_array() and memset() with kcalloc(). This code was detected with the help of Coccinelle. No functional changes. Signed-off-by: Gustavo A. R. Silva <gust...@embeddedor.com> Signed-off-by: Borislav Petkov <b...@suse.de> Cc: "H. Peter Anvin" <h...@zytor.com> Cc: "Peter Zijlstra (Intel)" <pet...@infradead.org> Cc: Andrew Banman <aban...@hpe.com> Cc: Andy Lutomirski <l...@kernel.org> Cc: Colin Ian King <colin.k...@canonical.com> Cc: Ingo Molnar <mi...@redhat.com> Cc: Kees Cook <keesc...@chromium.org> Cc: Nicolai Stange <nsta...@suse.de> Cc: Thomas Gleixner <t...@linutronix.de> Cc: Varsha Rao <rvarsha...@gmail.com> Cc: x86-ml <x...@kernel.org> Link: https://lkml.kernel.org/r/20190115173713.GA31031@embeddedor --- arch/x86/platform/uv/tlb_uv.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c index a4130b84d1ff..2c53b0f19329 100644 --- a/arch/x86/platform/uv/tlb_uv.c +++ b/arch/x86/platform/uv/tlb_uv.c @@ -2010,8 +2010,7 @@ static void make_per_cpu_thp(struct bau_control *smaster) int cpu; size_t hpsz = sizeof(struct hub_and_pnode) * num_possible_cpus(); - smaster->thp = kmalloc_node(hpsz, GFP_KERNEL, smaster->osnode); - memset(smaster->thp, 0, hpsz); + smaster->thp = kzalloc_node(hpsz, GFP_KERNEL, smaster->osnode); for_each_present_cpu(cpu) { smaster->thp[cpu].pnode = uv_cpu_hub_info(cpu)->pnode; smaster->thp[cpu].uvhub = uv_cpu_hub_info(cpu)->numa_blade_id; @@ -2135,15 +2134,12 @@ static int __init summarize_uvhub_sockets(int nuvhubs, static int __init init_per_cpu(int nuvhubs, int base_part_pnode) { unsigned char *uvhub_mask; - void *vp; struct uvhub_desc *uvhub_descs; if (is_uv3_hub() || is_uv2_hub() || is_uv1_hub()) timeout_us = calculate_destination_timeout(); - vp = kmalloc_array(nuvhubs, sizeof(struct uvhub_desc), GFP_KERNEL); - uvhub_descs = (struct uvhub_desc *)vp; - memset(uvhub_descs, 0, nuvhubs * sizeof(struct uvhub_desc)); + uvhub_descs = kcalloc(nuvhubs, sizeof(struct uvhub_desc), GFP_KERNEL); uvhub_mask = kzalloc((nuvhubs+7)/8, GFP_KERNEL); if (get_cpu_topology(base_part_pnode, uvhub_descs, uvhub_mask))
