Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp627578pxx; Mon, 26 Oct 2020 17:22:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMKUvQnJdOPW9sBAqYZkyTGw23icRmCKUiAip1BL6kJKrsJRBmHXQ9c9NIEU3LZbjfH8rp X-Received: by 2002:a17:906:a00d:: with SMTP id p13mr18630708ejy.183.1603758162160; Mon, 26 Oct 2020 17:22:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603758162; cv=none; d=google.com; s=arc-20160816; b=n2zWWu/V9UvzAdDjJ8v2nP7uD2aU1DJ9V8ecnBe4uYj3EX7OsETiRoXxjQ7tT4gJZx eOE40KKGO39+iwFzys13bikMxM9BLZBoEovSiXbwNjcW3AduB0yC8uwGm8oZDgRtm5Ta sZweMBMHavlANGHRu4GZWt2N1cvK3ewYiD4pxXRr182qQ/dBVGPppU+FH1/9qCyq6M23 JsmnCEGnzUhmJFO+fPeYMYodzklsZa03hM95N5Lc+IYt9k7TiM6kQFImHoJsGsLiEnRJ Yq3QsI+rVEJp1juD9XTyjsHlRNWsfXR2wMQZQurLL62gBygREjMc2tlfJ79o0It/soET YeqA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=mSoEnO2dZQPYEL2evl7LoR6xEpJNfFL/auc3APBUaws=; b=GZV8EKlKOEGAnZCDu2HBpUpAEtvBVSOzib2iJ4nPQbKm18ukyovXhCsW2ndXpLCndq EpqzsDDn2Z96iAxRCLZY2Pg/wPBSZ05A1bTsWfKKncjXI6xbISLmuwYyCqmT70t27HTV MlQnCN1iEXDVG6OjvB9fbqo+P/+9SC5CqALbyKG4t1yLBzFkqM9TM1H/U8Z012w8D7Jo sqBwc+1VkwrW6Sp0CAfrwb+hct///B25hSFUAruYbzH7kYl0JM/8ag4skSmnQOR12ONE r4kfsuMr2s1rtRoUAvs/rG638H0b2AQGjbeRNXXm70v2jwaJx6rVI6OviX4xgMSMV8vA BZqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="xNV/Jw+H"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dp16si7342767ejc.750.2020.10.26.17.22.20; Mon, 26 Oct 2020 17:22:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=@kernel.org header.s=default header.b="xNV/Jw+H"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2437704AbgJ0AEj (ORCPT + 99 others); Mon, 26 Oct 2020 20:04:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:52772 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731531AbgJ0AE0 (ORCPT ); Mon, 26 Oct 2020 20:04:26 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4708F20754; Tue, 27 Oct 2020 00:04:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603757066; bh=K58u8K/JlGdcL8WGVT4TPaAYQI1VqA8suyfsRhPu89c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xNV/Jw+HhlZImZNrO3ooOoImTK9pv3ZQvPJ/BibuWEsDmGIMRDVpJIS+2qzrTkYSo oPqfs9IC9M1WWtHZp94RzVLAtFe4Av1aUqv6ESOIFPcmmOYzvYOuj1nQXO5ginElJw lw5J/Vqe1eeUrqEzC4H8Y3GBBVxDUScR47U7tB5M= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zejiang Tang , Steven Rostedt , Thomas Bogendoerfer , Sasha Levin , linux-mips@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 08/60] MIPS: ftrace: Remove redundant #ifdef CONFIG_DYNAMIC_FTRACE Date: Mon, 26 Oct 2020 20:03:23 -0400 Message-Id: <20201027000415.1026364-8-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201027000415.1026364-1-sashal@kernel.org> References: <20201027000415.1026364-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zejiang Tang [ Upstream commit 39116103a7345927fa99644d08bc0cc9d45fea6f ] There exists redundant #ifdef CONFIG_DYNAMIC_FTRACE in ftrace.c, remove it. Signed-off-by: Zejiang Tang Reviewed-by: Steven Rostedt (VMware) Signed-off-by: Thomas Bogendoerfer Signed-off-by: Sasha Levin --- arch/mips/kernel/ftrace.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/mips/kernel/ftrace.c b/arch/mips/kernel/ftrace.c index b122cbb4aad18..7dd52da55907f 100644 --- a/arch/mips/kernel/ftrace.c +++ b/arch/mips/kernel/ftrace.c @@ -37,10 +37,6 @@ void arch_ftrace_update_code(int command) ftrace_modify_all_code(command); } -#endif - -#ifdef CONFIG_DYNAMIC_FTRACE - #define JAL 0x0c000000 /* jump & link: ip --> ra, jump to target */ #define ADDR_MASK 0x03ffffff /* op_code|addr : 31...26|25 ....0 */ #define JUMP_RANGE_MASK ((1UL << 28) - 1) -- 2.25.1