From patchwork Fri Jun 9 15:30:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 105714 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1033594vqr; Fri, 9 Jun 2023 08:44:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4GXG7T4kkph+6lCPpNFVvewXRmxLwppInfsbheHTg84IO0xJxiBIVB7J3MaojUTLgUpx8i X-Received: by 2002:a05:6a20:2588:b0:10b:f590:5a1f with SMTP id k8-20020a056a20258800b0010bf5905a1fmr1537787pzd.0.1686325458424; Fri, 09 Jun 2023 08:44:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686325458; cv=none; d=google.com; s=arc-20160816; b=jG8reviaf7ajqFBxyjpDNO3qk8cEyBqHYhFZn2dUmS2pZlEYUf7GMl/+5OwjphxicL FA6Uinh5lX8Hgcyta/bKfLX6E8Z9wy09810BqpXiw+DZcyZime5BHtgQ+YU+YX+vew8S cSBJLlXwOLNqAbXMwX3UVKKJAlSP65UoatwdMdrzdZBMpktKoPJDAHM8vvUgryC0QSk+ bSLQGOBZnRxtTWZdWr9FMhezYsW8wjKA5Nsww09HB7xoRDe55t361trC8Wg0vQaY91e2 feQXty4/F3xzpeNKM9+k6Y66MKebLCQgcPEGErMXllyo0N+O1qMM8ef3uxe2sRgxKxzZ r3OA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=B+BbmFxDtu9xvH6p+HuP5r+26x7/a6qi1ZnvCjgaCuU=; b=XZbzFLqO59E8GfGYN9Vfo2uwAbu3GA8L61CnfymlbhHfF0fbh+lWAJ5KSsFOp3/7R5 8kUcbox1Tfqp/yZTmyorsM9s05TULa1uSNdPVvPX4nB86/yJJzuILFLKSUswu3+3ivAH Wi8VjZaR1gPl8dHXKK5QW3WU5hx1stb2VZeGu3V1dAnd2d+M3wKRK6D7gnngfooQ5kB9 XUxArS1pG/DCTyh7Uk3gGe3oiiZEZQFBuAKllGfGMrI6+5f8bzp2apqBDfxl+eyXM0z6 AipWgexzeyO/TlqVis0CjSU89EyJljNXk2JY5hl45J7EtPn3nKZkRv2Io2xYQBy3MVTF Q4bA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=pG4Z5kjO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z11-20020a6552cb000000b0053f01212571si2834611pgp.257.2023.06.09.08.44.04; Fri, 09 Jun 2023 08:44:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=pG4Z5kjO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239324AbjFIPaY (ORCPT + 99 others); Fri, 9 Jun 2023 11:30:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59390 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241534AbjFIPaQ (ORCPT ); Fri, 9 Jun 2023 11:30:16 -0400 Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B23D9359A for ; Fri, 9 Jun 2023 08:30:14 -0700 (PDT) Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-652a6bf4e6aso1576167b3a.2 for ; Fri, 09 Jun 2023 08:30:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686324614; x=1688916614; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=B+BbmFxDtu9xvH6p+HuP5r+26x7/a6qi1ZnvCjgaCuU=; b=pG4Z5kjO6WszzBHcttx+lhvAD4M7pCMfl1UIuz9EYl2nfLVkrbCrWyPUoLp9vU699w 8j1Z0R2BZJhuoesfF3y5cIqECrJZ6EmRHeBA61Z76FTXBsjn0B6loloyCXgOPUB9dRPG h6LjM05eWz5XvT8am2cwVDsahnmFzPlKKFGW+pIXs1ffXgSt+OIGZl7qzTgBwIzSE2n9 /3vPZlc4dTCjzhOnTHzuGNKL6QUwOehFbiriFz7CxWPCvt7trsVRySqblRAfTI8ZnmSf 4RMeL0DN1BJlAva77JlkPT8ea4ZrlGzg8FYrgi0UkZdd/5XeNgI3ndcCfY/G1UnQObUa TDZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686324614; x=1688916614; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=B+BbmFxDtu9xvH6p+HuP5r+26x7/a6qi1ZnvCjgaCuU=; b=ktjjHJOAOL//6gZUGYfvw/btNCGClKbmeF8CSdRVP4kWSBKMumKrCLp68Mo7EQO4Qo pMjbQoPCOOKaq6NfL6N2YWlhoucC4+DZnWsg8Gmvp8B+r5SsJVcVOOXtJlcS7bm1en8u SmHUZxWu+h6H3daC+/b5GMX1cHXFok+OCmsVp++bYXNDWlGZ5oKc9wMPyVfiJQttbOdc I7yVoMLtFdjkbXQAwc8k9K12jvKKDPvL3QgbuOVEPfiz2kq3Hz+DIZjKYmBN1NezuQfK qyzxXO0X+T1tLO0mUrfzjitEFPq2C+DpPGbb8ii/lnOLr3eqR/Lgpg5z8suDz323vxyD +Ikg== X-Gm-Message-State: AC+VfDxQc2+dEy2QenVjhWASrn13gkkgc6ArJTx8L8VNfrpQK5JsqNaI nVhDTmK6AYE0pk/6q4QyOk6mtP+nGss= X-Received: by 2002:a17:903:234b:b0:1ac:a02f:c9a4 with SMTP id c11-20020a170903234b00b001aca02fc9a4mr1417022plh.4.1686324613912; Fri, 09 Jun 2023 08:30:13 -0700 (PDT) Received: from octofox.hsd1.ca.comcast.net ([2601:641:401:1d20:1bc3:5645:d3d:e4be]) by smtp.gmail.com with ESMTPSA id jj15-20020a170903048f00b001ae5d21e95csm3434648plb.117.2023.06.09.08.30.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 08:30:13 -0700 (PDT) From: Max Filippov To: linux-kernel@vger.kernel.org Cc: Chris Zankel , Max Filippov Subject: [PATCH] xtensa: only build __strncpy_user with CONFIG_ARCH_HAS_STRNCPY_FROM_USER Date: Fri, 9 Jun 2023 08:30:06 -0700 Message-Id: <20230609153006.1911402-1-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-1.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, FROM_LOCAL_NOVOWEL,HK_RANDOM_ENVFROM,HK_RANDOM_FROM,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768240403748766225?= X-GMAIL-MSGID: =?utf-8?q?1768240403748766225?= __strncpy_user is only used when CONFIG_ARCH_HAS_STRNCPY_FROM_USER is enabled so don't build the source when it's off. Signed-off-by: Max Filippov --- arch/xtensa/lib/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/xtensa/lib/Makefile b/arch/xtensa/lib/Makefile index c9c2614188f7..6e5b2232668c 100644 --- a/arch/xtensa/lib/Makefile +++ b/arch/xtensa/lib/Makefile @@ -6,7 +6,8 @@ lib-y += memcopy.o memset.o checksum.o \ ashldi3.o ashrdi3.o bswapdi2.o bswapsi2.o lshrdi3.o \ divsi3.o udivsi3.o modsi3.o umodsi3.o mulsi3.o umulsidi3.o \ - usercopy.o strncpy_user.o strnlen_user.o + usercopy.o strnlen_user.o +lib-$(CONFIG_ARCH_HAS_STRNCPY_FROM_USER) += strncpy_user.o lib-$(CONFIG_PCI) += pci-auto.o lib-$(CONFIG_KCSAN) += kcsan-stubs.o KCSAN_SANITIZE_kcsan-stubs.o := n