Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2518983lqp; Mon, 25 Mar 2024 00:50:44 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCV+lPm0ajTGHJkjKeQnexONGGVF3jSSQ/pCnHXtUYLBK5TR34Xm9202u5Q2jN5BJk9UJZq3uJuhv7w6SIZY1dLcjLjRtf4glQjvcPTafQ== X-Google-Smtp-Source: AGHT+IGF1kJoDgNcRwwE/ZD+ZpQP/Jk8Y/nxBm3UFCxgCDomYU9THFn1mbkWwvkc4d3e9k9hZWAQ X-Received: by 2002:a50:d593:0:b0:566:ecce:9d3c with SMTP id v19-20020a50d593000000b00566ecce9d3cmr4855521edi.26.1711353044578; Mon, 25 Mar 2024 00:50:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711353044; cv=pass; d=google.com; s=arc-20160816; b=lRJhhRKgh2G38oRR9GMrpWmqVQQtEKWg/FH2ghvurxccJvoab1Y76zIWQLXTcaSpx2 6thGdcII3m1UUgPFE5Xm+l9wnzXRsIJn5IEv5gnn2Pem3/8Wah5iN9FjtGSFLBodesSb uf0QFsg3/TnDLsE9R+FXu6TRbJqOzjxTkFepjYIBgOM30ligL4hasDr2qRUA0xNdCW26 fAzBgBJxP1m8zjEBkRPyemPQ9ujOaLP6Ewlz5VJh3gN/V8RrZdHaYjQzlR8QB826ikFX 6zZou6cHkpRW9W9RM9JScxbn/9XZHeUj1yPthRSjYGNvS8z84+VF55w657wVKx5q8BAy E89A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=/MDxrSJMgP7Cl63ieL7kuGod1CcwL2Lmyw0j5QtYmDw=; fh=fqbrJ6k9ZMDw3/hBnojHDMiZbhxiNWlKRyg2aT5L90k=; b=Eh2ig1SN9+MZsz7xXWUqpExzNSkewyu5RBuMVdqrPOVFkMwBLX4uP0daitkZlsrdGJ 1cZOiih5ilRXSzjhKDYumB8tr+9yvWZRcGvuXzWd8N+Q3tVg8OTR0PW7b0r01nJRP67W UTbeomf16w2yicQ3yPV15CdC+8iRh2KwcEpJJFROFKmdLnU/cVEUNPi62Cnz21g9rfeF kWpaJ4Ysgbdwqk3/zLz6MVkt3YWYzvW92w2Ks/0L+tU4gPm8gAKK09K+iGJ4uQsTKHew krlfBCtphkumcys+HT1pv0bevaUAZ7+V7uOd/mWNDCJtM2ZBM/jrOg2DSwobqVGjP62v fRfA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=uqkEW0ct; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115596-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115596-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id m7-20020a056402510700b0056c16645e4dsi375156edd.62.2024.03.25.00.50.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 00:50:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-115596-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=uqkEW0ct; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115596-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115596-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 486F11F2F698 for ; Mon, 25 Mar 2024 07:50:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C775A2519B9; Mon, 25 Mar 2024 02:47:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="uqkEW0ct" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD4CD128836; Sun, 24 Mar 2024 23:01:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321308; cv=none; b=mk+x/d/iiqcgz3zeF5WFMcxG3Q4ElXz2nGWFO+QkMK6No5YAx+3r9sBOATCMZ6CUrdaLnBNpx6bYVIguI4tKKdcDYSCSx4IsaKR8FUJfmPMl3lXRr+YDmacRHC81yC0yZAEwIxE11//C6Cwjqg0yjWE25ripOA7FQpVVRtGPTbU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321308; c=relaxed/simple; bh=DM56fWUpnYs8NKGcPFxbzDsx0rC5E5rIw5nd28XokT8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lsRZZCWN4JhMfGg/khjC2F7+NdKB3nYwrL2AQSfzihgaul3QevSbNoxQM3LjOGdz+BjE8AuWjtegXDkOgHgFnnTEAK+AtMd9/Asc9RWjB6lXb0ipx7EULihpBXCxq8R/jCiXAdk5+z6wGTawrmaP/EPWWEPh5kPetSkomraBfs0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uqkEW0ct; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id D02CAC43394; Sun, 24 Mar 2024 23:01:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711321307; bh=DM56fWUpnYs8NKGcPFxbzDsx0rC5E5rIw5nd28XokT8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uqkEW0ctt209EmAQXzqz/3yCq8NVWcP2dLmCRsFdve/iHKadF97FQ13fRfp2ntnws oDks5yNLIfjQdlPeMMfhF0K2qIGT4qYI+Ly9IYHm12o0ZSDqvThpioBDiKPYv/m8ht emgo+7vrihi0deoBK1NUcGAiXq8pWgc15F8EPaKohzDKBCejNTnWz7AD16OnhT83Qv unb2Ss4myZVAL1cVbkQy7w/s6VMEeGo46o0Ac27EK3g4/hCXSloP4Yi6aLaA91BL11 5Vjc/jh7gVUC+wOQMflFdbpva41lx/67VqbDYtlT01pmvBpCQmnKOr41WbNSAEYy0n DI91mPsy8k+1g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Max Kellermann , Helge Deller , Sasha Levin Subject: [PATCH 6.6 030/638] parisc/ftrace: add missing CONFIG_DYNAMIC_FTRACE check Date: Sun, 24 Mar 2024 18:51:07 -0400 Message-ID: <20240324230116.1348576-31-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324230116.1348576-1-sashal@kernel.org> References: <20240324230116.1348576-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Max Kellermann [ Upstream commit 250f5402e636a5cec9e0e95df252c3d54307210f ] Fixes a bug revealed by -Wmissing-prototypes when CONFIG_FUNCTION_GRAPH_TRACER is enabled but not CONFIG_DYNAMIC_FTRACE: arch/parisc/kernel/ftrace.c:82:5: error: no previous prototype for 'ftrace_enable_ftrace_graph_caller' [-Werror=missing-prototypes] 82 | int ftrace_enable_ftrace_graph_caller(void) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ arch/parisc/kernel/ftrace.c:88:5: error: no previous prototype for 'ftrace_disable_ftrace_graph_caller' [-Werror=missing-prototypes] 88 | int ftrace_disable_ftrace_graph_caller(void) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Max Kellermann Signed-off-by: Helge Deller Signed-off-by: Sasha Levin --- arch/parisc/kernel/ftrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/parisc/kernel/ftrace.c b/arch/parisc/kernel/ftrace.c index d1defb9ede70c..621a4b386ae4f 100644 --- a/arch/parisc/kernel/ftrace.c +++ b/arch/parisc/kernel/ftrace.c @@ -78,7 +78,7 @@ asmlinkage void notrace __hot ftrace_function_trampoline(unsigned long parent, #endif } -#ifdef CONFIG_FUNCTION_GRAPH_TRACER +#if defined(CONFIG_DYNAMIC_FTRACE) && defined(CONFIG_FUNCTION_GRAPH_TRACER) int ftrace_enable_ftrace_graph_caller(void) { static_key_enable(&ftrace_graph_enable.key); -- 2.43.0