From patchwork Wed May 5 12:04:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 431166 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp437972jao; Wed, 5 May 2021 05:05:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyBgpD3wPr6OOjSaubfddx+KY9nRHQm+AElnKTpGZzi6lBJEGBq38t62qtU2GbxnTJyXSWD X-Received: by 2002:a50:82e2:: with SMTP id 89mr31699453edg.0.1620216324557; Wed, 05 May 2021 05:05:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620216324; cv=none; d=google.com; s=arc-20160816; b=McIlT/zw4wdgeMOV5P/cppl2xvAmUMpXS9lDKi5e2ycJ4tf2+fyDufSuXd1fO2CE5S 7CmeFhFdP+SO55a43hTWbw2/RcLZS12iPACnxnZVTAJV6jyqSWVUDPckqCt6o9cHaua8 c+AhrDejlxdsreYKEiDu2b3N7qSV1nhGJXnXVl7UQviGx/gcPwV0i9FRY2sNZUtyGYR2 9fP6wUszMA9mkNUG9UIry2o8QmnNQvkMNfuqJUwzQsjcHwmYSFIhXd2VPI6qsWl2PJxJ HwtGaLdvBSDXDEuuZ9qsXhNEyKiKUXRqYFgZXToPW9oR0R4gJlk7wiL+1/Pb0+6N2g1v YKyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=PIJYlXjdw53PfYLx2DSHq5s9wqpwv6At+G1xVR393ls=; b=MkGGBupdW+SPV1YkNHdegLncsBzoS9MIG/ii0Gf/d+beG2qtNXotzJOqHGkUOLjEXb IGnBkfY8AmBm2xZjoPB1Gr/Zs0tXanpLZeaTDh5NQ49lsBkVoE7p+mGIZHBio/mDms/e QWN3vktAfvtXlx55D06xkQEmaKVR6X050T0OmqAFABaXwSL4LOAEPJzPJuSmpItOcoc9 c5XHNLq0u0YX0ZFBlC57glNCTiZZ48Wt7GZd4IfPaVDHHvRIzUxtcdRpiSrHxsA29LxD KTkw5OmnFJNlurplMEjzUwXTs3zhK5Qyn5zIymFkXbgQON6JxaHDZYv3NnhIxE9dF4Hs 0xRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZX5QMRoS; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h8si12323781edb.587.2021.05.05.05.05.24; Wed, 05 May 2021 05:05:24 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZX5QMRoS; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233251AbhEEMGN (ORCPT + 12 others); Wed, 5 May 2021 08:06:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:43844 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233203AbhEEMGI (ORCPT ); Wed, 5 May 2021 08:06:08 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1705961154; Wed, 5 May 2021 12:05:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620216311; bh=EZ91tBBeYNpgMvqnjztljXaqTqj0kUPnLzpKRLHH8Kw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZX5QMRoSHpm1EcZMmrvJNc0/6ECUdBNafq9pKWP9xqiGESRqQmNigLQwh/7yxlkU6 HuXRaR7ZM1r8MjfIsD4VO6uekpkiPKECe5VFnUDo/h44hzokjLf0GtX+lpDXZ9ZZjO hBdL0CAWN0rPOd8mVbLYODqPdaD9y+AwJz/nLZ1s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , kernel test robot , Arnd Bergmann Subject: [PATCH 5.4 09/21] avoid __memcat_p link failure Date: Wed, 5 May 2021 14:04:23 +0200 Message-Id: <20210505112325.030497699@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210505112324.729798712@linuxfoundation.org> References: <20210505112324.729798712@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann The kernel test robot reports a link error when the stm driver is a loadable module on any v5.4 kernel: > ERROR: "__memcat_p" [drivers/hwtracing/stm/stm_core.ko] undefined! This was fixed in mainline with commit 7273ad2b08f8 ("kbuild: link lib-y objects to vmlinux forcibly when CONFIG_MODULES=y"), which is fairly intrusive. Fix the v5.4 specific issue with a minimal subset of that patch, linking only the failing object into the kernel. Kernels before v4.20 are not affected. Reported-by: kernel test robot Link: https://groups.google.com/g/clang-built-linux/c/H-PrABqYShg Signed-off-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman --- lib/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/lib/Makefile +++ b/lib/Makefile @@ -31,7 +31,7 @@ lib-y := ctype.o string.o vsprintf.o cmd flex_proportions.o ratelimit.o show_mem.o \ is_single_threaded.o plist.o decompress.o kobject_uevent.o \ earlycpio.o seq_buf.o siphash.o dec_and_lock.o \ - nmi_backtrace.o nodemask.o win_minmax.o memcat_p.o + nmi_backtrace.o nodemask.o win_minmax.o lib-$(CONFIG_PRINTK) += dump_stack.o lib-$(CONFIG_MMU) += ioremap.o @@ -46,7 +46,7 @@ obj-y += bcd.o sort.o parser.o debug_loc bsearch.o find_bit.o llist.o memweight.o kfifo.o \ percpu-refcount.o rhashtable.o \ once.o refcount.o usercopy.o errseq.o bucket_locks.o \ - generic-radix-tree.o + generic-radix-tree.o memcat_p.o obj-$(CONFIG_STRING_SELFTEST) += test_string.o obj-y += string_helpers.o obj-$(CONFIG_TEST_STRING_HELPERS) += test-string_helpers.o