From patchwork Tue Aug 6 16:25:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 170674 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp5920851ile; Tue, 6 Aug 2019 09:25:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqwaRhIBVpfwh+kj7lSjyx6L8Foq7cakRslGbNF7oDnJJ6WvVmJ3/DSZr982wMMPoFwSE3fp X-Received: by 2002:a62:79c2:: with SMTP id u185mr4589211pfc.237.1565108748139; Tue, 06 Aug 2019 09:25:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565108748; cv=none; d=google.com; s=arc-20160816; b=FIYIPsoxjGsYtR1o0pSwtJd3Eqwmi3tecLkHbEadiJZsFutth2ejObl7uipWjrp7is 9t/fzqd0f1leuADxeUZVUmXKb7kMzxh11WrKNZLQ/exRTCqYWw++++sjjLGCw4csgLVd qG8QiVxBpQy+65J25zJdYIAhyPcjcShOaUud6yk0k0+eQ4QJqvWxGmZM1dWQrJiOl69A yJ6gWyt6E7nU1qbEnmf1sWmgDqcrgLel0CBYpK2gJJPvpVV1ckUYwZzBvb8hkP6+VNph qwIiZ7BtaKbg6uK05lK9kVNryH6AVfx532K7LR5L2xvgO12jaEEtWQ8ni6A46XhyoGht e+8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=6Q543W+sS1zhY9fAmyWB4Gv6mamYpmBCAUmjHIOgJdg=; b=KWgAE/yJGorK+GOtYFChoa2aKryU5gk9HAm3TqoxVJXcm+gKretycunyk51wdgrlR1 vQcpewb0VZmO3XbbU/znUSM622v1yP08KUZ0SbOfu8VLPK8z2hJ4yPmP9HezezSivTtH KfaGV/huQ3MyHrWqzrX6OS9NHlB+xtHASleJdGgz4JXUaMqvLNRpFs8aMO+QMEtpjvCG O2/z3jHopy/UlopQ31sHPH9uEjRXpibJpMl4BMVIiWcRz9vmrenQkXLy48TUa7wIznqn aiQdyWDOVu7Jprcxkdj2R0lDFvcsxqKnWfzy1LAuRnMccoDuOgkXxgwTMwz+qTGA1pc1 DcQg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f10si15045050pjw.89.2019.08.06.09.25.47; Tue, 06 Aug 2019 09:25:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387776AbfHFQZq (ORCPT + 29 others); Tue, 6 Aug 2019 12:25:46 -0400 Received: from foss.arm.com ([217.140.110.172]:36310 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728927AbfHFQZq (ORCPT ); Tue, 6 Aug 2019 12:25:46 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D9793344; Tue, 6 Aug 2019 09:25:45 -0700 (PDT) Received: from lakrids.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id F15AB3F575; Tue, 6 Aug 2019 09:25:44 -0700 (PDT) From: Mark Rutland To: linux-kernel@vger.kernel.org Cc: Mark Rutland , Andrew Morton , Borislav Petkov , Gary R Hook , Ingo Molnar Subject: [PATCH] lib: remove redundant ftrace flag removal Date: Tue, 6 Aug 2019 17:25:39 +0100 Message-Id: <20190806162539.51918-1-mark.rutland@arm.com> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since architectures can implement ftrace using a variety of mechanisms, generic code should always use CC_FLAGS_FTRACE rather than assuming that ftrace is built using -pg. Since commit: 2464a609ded09420 ("ftrace: do not trace library functions") ... lib/Makefile has removed CC_FLAGS_FTRACE from KBUILD_CFLAGS, so ftrace is disabled for all files under lib/. Given that, we shouldn't explicitly remove -pg when building lib/string.o, as this is redundant and bad form. This patch cleans things up accordingly. There should be no functional change as a result of this patch. Signed-off-by: Mark Rutland Cc: Andrew Morton Cc: Borislav Petkov Cc: Gary R Hook Cc: Ingo Molnar --- lib/Makefile | 4 ---- 1 file changed, 4 deletions(-) I've verified this atop of v5.3-rc3, where the Makefile removes all of CC_FLAGS_FTRACE (containing "-pg -mrecord-mcount -mfentry") from the CFLAGS for building string.o Mark. -- 2.11.0 diff --git a/lib/Makefile b/lib/Makefile index 29c02a924973..c5892807e06f 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -21,10 +21,6 @@ KCOV_INSTRUMENT_dynamic_debug.o := n ifdef CONFIG_AMD_MEM_ENCRYPT KASAN_SANITIZE_string.o := n -ifdef CONFIG_FUNCTION_TRACER -CFLAGS_REMOVE_string.o = -pg -endif - CFLAGS_string.o := $(call cc-option, -fno-stack-protector) endif