From patchwork Mon Jun 3 09:14:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 165590 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp4208145ili; Mon, 3 Jun 2019 02:15:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqxFVdb+422CKF7SpNSE6htfrpZ1/EkrMcWGNSth0jbjhMyOW/1zCgErcFZrV8vgBmPQ43HI X-Received: by 2002:aa7:8ac9:: with SMTP id b9mr20683768pfd.260.1559553306183; Mon, 03 Jun 2019 02:15:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559553306; cv=none; d=google.com; s=arc-20160816; b=adlX+wiH2ZaRevoLjoMSai5eZaP4CWJVlTCi27UsmHxtDmvC6HGrV5wb1poyYMcO5x HGjPKq8E250HONyRblu1gujDE1wRrQ68Z2wKMTVu4Ke7OC3D44gaZRrkL9G5yH1gq900 Ple0junqB/PpUrUa20SMkc7QTqZMl/53AyEIgFuFPHX85v4kEq5ZBHf3eo0ALprXlvwZ SZl/6tpmcwbO1753KeXnz3cBWHnZUsTVmO1X1F3e0bTTg8M6cfh1dVJCKrjDl5K8d0X5 vfjgzBl64jABhtCbOsVM51vjZVnE5axVZUTEcrY8K3Z39AVyQoa9fABMZnBczgYQ9Fg2 sLGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=+y2pHh+GcgrSTo/c/Dh+rI5M9UbSYW68+phN/wa7KlA=; b=C8hhqAHEjFpxbe9zZUpZQinMMlf9aCHo/G0y3tXlb/PCAmkP+RbfQVSYhxPDsgGOzt ZeL/pZvz5snohKE3hcIimUWX1Sf75P4DTyFREoka9GsptTd0uPeq9QYSiKH/w2ePItet 46o/naCdTUifWEB6nJ5LOYJCaehXhL96DeyLBzo0p2M1joOFSpHaMmk6+aIdXBVjIsHs d18CwFSbYvk2A6qK+m1einzSyTB9KwIoEP6ZpjWFhOEgWDIYZ8/JL5vLgJ7HnyBuA+Pm +QShy1y7lfVze++sg47e7DU6JcxZGKmWjvlfE52Ri0/kPQI2DlJWj6lwmP1TI2KggjFX jg2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XwNM5aaS; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t7si16163280pgu.3.2019.06.03.02.15.05; Mon, 03 Jun 2019 02:15:06 -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; dkim=pass header.i=@linaro.org header.s=google header.b=XwNM5aaS; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728974AbfFCJOO (ORCPT + 30 others); Mon, 3 Jun 2019 05:14:14 -0400 Received: from mail-lf1-f66.google.com ([209.85.167.66]:41874 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728223AbfFCJOJ (ORCPT ); Mon, 3 Jun 2019 05:14:09 -0400 Received: by mail-lf1-f66.google.com with SMTP id 136so1465400lfa.8 for ; Mon, 03 Jun 2019 02:14:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+y2pHh+GcgrSTo/c/Dh+rI5M9UbSYW68+phN/wa7KlA=; b=XwNM5aaSm3fVul6uRnmu+Fwt9JaXj3z2dqhDZMARNqS5naUoZNgGLSLwsvVmsEz9yL c0arF2jfhe472ek/T7KaHJmQe9ZWn1vIfZ1zP3sWpdcTKzQYLngpHvbE9cMqmevghtv2 92WTx36NG/u22grAhRBghDdGYWYAN10P/F+6XrvTXTaVMDBR/IAUa7VqHxE5fhzulF7u TBxjumz03UwitufJJztAVu7RNIaNbl7bk2FnoJQgm9CNOu+gAMsfZDTuf2C3ANydj6hx 8nQoerNpFuFxav5hC+2HVyIO1P5ydRDPAKnde4Ng8ABvXfh6QZ+0BZrD8Kl48BfUb6cH mriQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+y2pHh+GcgrSTo/c/Dh+rI5M9UbSYW68+phN/wa7KlA=; b=j1bqvcR05wwiAL1U0/68KfLPDmzS+Zy5Fdmsdmwt/ovNe9VZIV+6K1SLeC3lBPZpqT qz4dNdns2tBBHLXDB+HR6EG7zyVSQXxPcFZovgpASFFUkDxD4vmosDNOtDNC5Ud/CMCz YCIDtkuYRxSz92g5VZd67srbJYHDiiiBGfho2NcxExvKFZYx9cPicOlLgbkln5cdDnmv JM5HdfTb7MLaCjP0VVI68kHOrN1Ts8FPRR9Gbd2+Ak1SamVpDxnqAXJcP0TyXukSik7t 6NnOhvVj7lOC2tj2FTOcgm0S4kVKSd8UY3AIqsZu07VG5qKOVyGTX0figV52utfyBC2r Az5Q== X-Gm-Message-State: APjAAAUYR8sjaB1gVFB1wNrNnnX0KKGn+CedBQxZwatJkno4R2KTd0c5 pL8NNueoVnjrf1MJs0vD5BCofA== X-Received: by 2002:ac2:5449:: with SMTP id d9mr14199136lfn.126.1559553247684; Mon, 03 Jun 2019 02:14:07 -0700 (PDT) Received: from localhost (c-1c3670d5.07-21-73746f28.bbcust.telenor.se. [213.112.54.28]) by smtp.gmail.com with ESMTPSA id o184sm3068020lfo.37.2019.06.03.02.14.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jun 2019 02:14:07 -0700 (PDT) From: Anders Roxell To: mark.rutland@arm.com, marc.zyngier@arm.com, catalin.marinas@arm.com, will.deacon@arm.com Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@redhat.com, Anders Roxell Subject: [PATCH 2/3] arm64: arch_timer: mark functions as __always_inline Date: Mon, 3 Jun 2019 11:14:02 +0200 Message-Id: <20190603091402.25115-1-anders.roxell@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If CONFIG_FUNCTION_GRAPH_TRACER is enabled function arch_counter_get_cntvct() is marked as notrace. However, function __arch_counter_get_cntvct is marked as inline. If CONFIG_OPTIMIZE_INLINING is set that will make the two functions tracable which they shouldn't. Rework so that functions __arch_counter_get_* are marked with __always_inline so they will be inlined even if CONFIG_OPTIMIZE_INLINING is turned on. Fixes: 0ea415390cd3 ("clocksource/arm_arch_timer: Use arch_timer_read_counter to access stable counters") Signed-off-by: Anders Roxell --- arch/arm64/include/asm/arch_timer.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.20.1 Acked-by: Marc Zyngier diff --git a/arch/arm64/include/asm/arch_timer.h b/arch/arm64/include/asm/arch_timer.h index b7bca1ae09e6..50b3ab7ded4f 100644 --- a/arch/arm64/include/asm/arch_timer.h +++ b/arch/arm64/include/asm/arch_timer.h @@ -193,7 +193,7 @@ static inline void arch_timer_set_cntkctl(u32 cntkctl) : "=r" (tmp) : "r" (_val)); \ } while (0) -static inline u64 __arch_counter_get_cntpct_stable(void) +static __always_inline u64 __arch_counter_get_cntpct_stable(void) { u64 cnt; @@ -203,7 +203,7 @@ static inline u64 __arch_counter_get_cntpct_stable(void) return cnt; } -static inline u64 __arch_counter_get_cntpct(void) +static __always_inline u64 __arch_counter_get_cntpct(void) { u64 cnt; @@ -213,7 +213,7 @@ static inline u64 __arch_counter_get_cntpct(void) return cnt; } -static inline u64 __arch_counter_get_cntvct_stable(void) +static __always_inline u64 __arch_counter_get_cntvct_stable(void) { u64 cnt; @@ -223,7 +223,7 @@ static inline u64 __arch_counter_get_cntvct_stable(void) return cnt; } -static inline u64 __arch_counter_get_cntvct(void) +static __always_inline u64 __arch_counter_get_cntvct(void) { u64 cnt;