Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp870757pxx; Tue, 27 Oct 2020 02:31:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxKEEGro5xAqmS5lz/wZSYANgnXeQb6VvuS47yoTkFJ2i3ce3k3Tpy5yidC9mGe9CqOVNeo X-Received: by 2002:a17:906:ae48:: with SMTP id lf8mr1441178ejb.345.1603791096707; Tue, 27 Oct 2020 02:31:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603791096; cv=none; d=google.com; s=arc-20160816; b=H2VRNKDa+c5kdy+Ac7oDD7mZi3VMQEFqz37sKjEQfklok3PzMi/5b9SalwzXqLHLsh bY7rdN7WtLQwB0Puei4B7BcNs01zYC9Rr3R/ph8GbWXxAhVt1d9B6W2BjuDnHAID2xrd 4ys0/yliJjndIiJ6dKgU1tE8nO1znOfKbcBwcLMdfogYVmKJ64WEcsHO10tEiTydHQvW fB/tUp7gYbfnOuEV6QF+wLl8TdYg/rLQs2zd+xsWVv2Vq3iuhUTbCdgq0CaSl+cSkkRs gfHpFkJ7cdfOerbKjFO27hQ2JK4P7W36IZa9jn/YNXvNlvJTGPlwv19xOrlFepHuFQaO +TSw== 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=okaDhWk7iUzmcOdMQ/hgI088EMgW1u2SeVLKGBZqGck=; b=h+wr0GnzYxRAAUdO64B9QMCtbj+e+VS/ruT3MFz4DFOjN9D8xPEWQpxepXd6UQjxzO edGJ8FdL4rQzUpUZVGfLeqBjZP2WVjErKwSQvG/+ToMrjm8yBmS2bNictTDi4RP1BnLx 3paFj/m6fzCQy/abd4xKkY7u3KmcCSgXAp759GHNkKLp/hg+svGGRnMzUvozoJoL5IsU jPtMg33aDP0aphk/fx2K4KWoM+jKHkl8Dc02RI7AdSY5jdFFaj0QFVQ60x1oOti2OX+L YeNBuZ+zY58YKsAPkbh6DaZOCTfdNrgPu/q7R44zIl0XBo8t/uLp/WZ1+O4TBBs3YfIQ ppQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=F7GB5vJs; 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 sa27si572904ejb.546.2020.10.27.02.30.59; Tue, 27 Oct 2020 02:31:36 -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=F7GB5vJs; 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 S2408832AbgJZXtx (ORCPT + 99 others); Mon, 26 Oct 2020 19:49:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:47534 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2408720AbgJZXta (ORCPT ); Mon, 26 Oct 2020 19:49:30 -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 3DDD820773; Mon, 26 Oct 2020 23:49:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603756170; bh=K+pXON+EpeZwcukcdCKp2fT/ruRvzTT1E/1PKb+EpGg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F7GB5vJs3mlYXdSWeIAV+jFCYP7OcQ9uhO7MQ3w9Q6gemMkPUdmH+2CtAOHykvbbH UWimNqvFCRV1WxSDJ2Pv59oOqB/QSqbKVRE5wPZNUQzd2tTD2QIKmX+X58RX+YeKjg zi1snuzVCxHKF4rSAYqF5fsK3/wX6kgZOYYdKRDI= 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 5.9 019/147] MIPS: ftrace: Remove redundant #ifdef CONFIG_DYNAMIC_FTRACE Date: Mon, 26 Oct 2020 19:46:57 -0400 Message-Id: <20201026234905.1022767-19-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201026234905.1022767-1-sashal@kernel.org> References: <20201026234905.1022767-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 2625232bfe526..f57e68f40a348 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