From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C498C606BD for ; Mon, 8 Jul 2019 15:32:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 690C32175B for ; Mon, 8 Jul 2019 15:32:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562599979; bh=7hQTXNKTVE51JAzz/0jxsi5MNoIHeJexkZF5jwsc5jc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YNQ+ctCG+3hfQKHgsAnzexbiZiSCBLSTJyCIcFfw/SbFvxM5OaEXltRjCJ8D7bsSx OADl7Bf1g1VdCg70M4wTRZTxdu6BPdcuBgzQEnkGiUoabg9xQu9WWZCDD0YmV44aRo zlsJAAqDdiA96offS5ouBIN9X5PZqbCZE5WgLMGk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390235AbfGHPc6 (ORCPT ); Mon, 8 Jul 2019 11:32:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:34818 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732686AbfGHPcz (ORCPT ); Mon, 8 Jul 2019 11:32:55 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 28EE120665; Mon, 8 Jul 2019 15:32:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562599974; bh=7hQTXNKTVE51JAzz/0jxsi5MNoIHeJexkZF5jwsc5jc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rv2XFsgdVT80YfSQfcLqQBw8SU62+LBre6A1PapJvfAyAWltBZDtqbBgZ7aEqT1cz x8GM03kHPve4crCXTTU00IIHhG6pCEJBVLhM9jcR1CGJv5wJytqtIpmnM+UxDdMxlH OKcpos4xo7DWZBMaKB6bKrt5u7bcS4dGit4AzEb0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vasily Gorbik , "Steven Rostedt (VMware)" , Sasha Levin Subject: [PATCH 5.1 53/96] tracing: avoid build warning with HAVE_NOP_MCOUNT Date: Mon, 8 Jul 2019 17:13:25 +0200 Message-Id: <20190708150529.373569464@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190708150526.234572443@linuxfoundation.org> References: <20190708150526.234572443@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit cbdaeaf050b730ea02e9ab4ff844ce54d85dbe1d ] Selecting HAVE_NOP_MCOUNT enables -mnop-mcount (if gcc supports it) and sets CC_USING_NOP_MCOUNT. Reuse __is_defined (which is suitable for testing CC_USING_* defines) to avoid conditional compilation and fix the following gcc 9 warning on s390: kernel/trace/ftrace.c:2514:1: warning: ‘ftrace_code_disable’ defined but not used [-Wunused-function] Link: http://lkml.kernel.org/r/patch.git-1a82d13f33ac.your-ad-here.call-01559732716-ext-6629@work.hours Fixes: 2f4df0017baed ("tracing: Add -mcount-nop option support") Signed-off-by: Vasily Gorbik Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Sasha Levin --- kernel/trace/ftrace.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index b920358dd8f7..538f0b1c7ea2 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -2939,14 +2939,13 @@ static int ftrace_update_code(struct module *mod, struct ftrace_page *new_pgs) p = &pg->records[i]; p->flags = rec_flags; -#ifndef CC_USING_NOP_MCOUNT /* * Do the initial record conversion from mcount jump * to the NOP instructions. */ - if (!ftrace_code_disable(mod, p)) + if (!__is_defined(CC_USING_NOP_MCOUNT) && + !ftrace_code_disable(mod, p)) break; -#endif update_cnt++; } -- 2.20.1