Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2509268lqp; Mon, 25 Mar 2024 00:20:09 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXTUZCb+GGGge2gxvWnDFC6uuaF3F7N/A5zy+XZVmVD+mlDm6XlUJGrfxqhSIYrdseC8JisQc7i/DuXPhy0Y+xUvpaY4UwJTcCbnkVmaw== X-Google-Smtp-Source: AGHT+IERP02S1G4tS/OmtJGdN4ad+7GAKXyhK20o9oGjP6JGAEtTL5GvS8EDslzfQRWB4aBIBlaA X-Received: by 2002:a05:6a20:3d8a:b0:1a3:a775:2588 with SMTP id s10-20020a056a203d8a00b001a3a7752588mr6889470pzi.31.1711351208707; Mon, 25 Mar 2024 00:20:08 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711351208; cv=pass; d=google.com; s=arc-20160816; b=gwVuEhF2Wrq8cy546cQkdgk6Iy9yg6R1rgQQgUbkOwXe45hgkOJYblIcH7+rnV4nBD RiGHsN+SEeUTvj5gXSPyLD97ccKyiRw4SAYYbv55/INwHuOxTRQ2L1tig7Qr0k/2r6D3 m6INOPDbu1blN00PPfG6/GZFa3Yr5utsm9EDSP44oaoinass0jUV/KokK4WY3F0h31GX YpZQeSAyLPrbOF5pO2/mVnMmrUOBLwvM1aPVc9HBzMnOhr+TOwVCNg7OL3sCZeyiT6mL 0grksdXOsNAbwpeWxZe9iCud4Yohbp1aEEqt1qQNYhH4ndbWYKGypgzP0Kv9+E7BqpHs QSZw== 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=UiDc1OqIJiqjGFFMVmyVa6R41gAY0J5K9mMHZqDLC0Y=; fh=fqbrJ6k9ZMDw3/hBnojHDMiZbhxiNWlKRyg2aT5L90k=; b=IIttx6hrgYFCeGeiZG1ThcSf5KnRIqj5OxyH1DXHjGCBlrJF74LercPnFaWqDYJVsm LCRc3ujeicb8At/W4k/N9Fd2Vr6WnT8ZLFYejubSoP+L2/DbPYnVZtKUgJFr0m2tAcQU gLBw53wVVLAIlSDApO3e1XZd/Mq+P2oYzKUyGycK1JHPUa0G77Xz/ewnV0xQCeIH3Ru2 pUWIuykUB0WA834vSWnARVBLuMUt+vtE50tTeqFGLA4Boua+vRn51MP23k04kHsWwhD0 rEcZHPh9KXbVXbO0mp8IvIiXMyJisPWUYT32yrdW29vg5tR+if0C2SLDeqmL6X6Pacau YCuw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=toZ1DJzr; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-114937-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-114937-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id c4-20020a630d04000000b005c67029a131si6843913pgl.220.2024.03.25.00.20.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 00:20:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-114937-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=toZ1DJzr; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-114937-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-114937-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id ECDDD29E053 for ; Mon, 25 Mar 2024 07:11:04 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5B87773535; Mon, 25 Mar 2024 00:56:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="toZ1DJzr" 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 1B530179FB0; Sun, 24 Mar 2024 23:40:46 +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=1711323647; cv=none; b=dX+hjyWBbFnLs1W6G5xYWH8Y46zxG2Y5ad8DSCsbH6WBFMBndiNwsHJOyI91VhilWFdj2m9euDMRTaR8UTuKj6ASnD/WEg/YWwlAjYKIjTcMlATU8VmYGHolOn8z/UUdm3NreROSmwMIweoZznCyQh8w1Sgzn0/JiaHvs5sseq8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711323647; c=relaxed/simple; bh=Fg21IVBdDngt1etfWcnPSEvzp7Y5DXNt8psD2PSobPY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OMo+9XLUQaVug4SVtbIa3XVk9bFvwtqtFw7tZk5Z59DcFNiPLA1bnHjQetmQm3cBl+HlLPl/+vc+1ygDWTlx85M8hptL6rq/Zb19fyLDBc14hN4dULxBxZ8OpJ35iki35/JrpSrBTw9uk2dOqv8BYUJ5E8dse7uEnvo4rlaN6+c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=toZ1DJzr; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 51235C433C7; Sun, 24 Mar 2024 23:40:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711323646; bh=Fg21IVBdDngt1etfWcnPSEvzp7Y5DXNt8psD2PSobPY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=toZ1DJzr/oAPjR7bv+gznv8iFYQTtX+5vpnQ33zAWbWclWK8avxJeP7L30ynIDxCp mGgC3qK5bjVBLF2nLi4HG+gjHvqA/EuqaDJBAYYQ7O/XXP3zpC+4RMzJ1nPL/HLZUA xQy8p42ZdG2THxnNOss1uS/AEOyaLg6bGkC77ktb+OZ32ulGjFLsDXpNIfITWlN1Ul kDFutl4fHHVt4DBJ5m90hG9ETo/r7pSTUqgcLU4Ocx6BaD/fIkTlsWVJmKmhXWf/Zy mzbdG8azNG+jm/Gr+Uxvm6DnO8tbCHhszS3eu4lweO0a+FZ7HqUiBMm47tYYYZIUJG ur+bYfi1ayTdQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Max Kellermann , Helge Deller , Sasha Levin Subject: [PATCH 5.10 017/238] parisc/ftrace: add missing CONFIG_DYNAMIC_FTRACE check Date: Sun, 24 Mar 2024 19:36:45 -0400 Message-ID: <20240324234027.1354210-18-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324234027.1354210-1-sashal@kernel.org> References: <20240324234027.1354210-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 63e3ecb9da812..8538425cc43e0 100644 --- a/arch/parisc/kernel/ftrace.c +++ b/arch/parisc/kernel/ftrace.c @@ -81,7 +81,7 @@ 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) { return 0; -- 2.43.0