From patchwork Thu Mar 26 19:23:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 46378 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0829C21585 for ; Thu, 26 Mar 2015 19:23:46 +0000 (UTC) Received: by wibfv9 with SMTP id fv9sf260375wib.1 for ; Thu, 26 Mar 2015 12:23:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=EjQORg/JOt8tZmtSIwEy8vxTwY88qkitJltp0hK9k0E=; b=hn2nhm8q9XfOc82C2ci5Paf5dNvxvrO+3eZzdgMKK3sDX5RrBYfKwE5j/Zgwtuk+1J pNU9XAIIGlnj6Gk34nu5gcC4dupe7mzMXZ9VnNrGfsOFyWfX5mNKx+WmxEcumNJkhIAR pJXcJs0W2l6bel4Qb7+Bjej1k3PsxZjUshuHE5Xw6YwfKrxyt+Y5HD+2cgANjaCokI6m xARSHufDtaOGmDue3J1+3QDy8Kh+dATKWtGrA8MsXAYyqczxuHuF7/Z0j+674z33NKik 4mW32x6o9sEnrhlPMSM/u6R8ZzdZW+y12dKEJf6M6QyQaIRRPNvV/vcpY5GOFkW6DeX4 lbEg== X-Gm-Message-State: ALoCoQm7EIzyRm2/uOdhVjGf55xrDV3ci7EIDvTLhwp9JGHS8AXuY6x3P0W2yb+RXS6d//ye7/ZH X-Received: by 10.180.35.230 with SMTP id l6mr153740wij.0.1427397825349; Thu, 26 Mar 2015 12:23:45 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.206.72 with SMTP id lm8ls296872lac.3.gmail; Thu, 26 Mar 2015 12:23:45 -0700 (PDT) X-Received: by 10.112.133.2 with SMTP id oy2mr14917053lbb.124.1427397825189; Thu, 26 Mar 2015 12:23:45 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id pq6si5303158lbc.137.2015.03.26.12.23.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Mar 2015 12:23:45 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by lahp7 with SMTP id p7so34889384lah.2 for ; Thu, 26 Mar 2015 12:23:45 -0700 (PDT) X-Received: by 10.112.218.5 with SMTP id pc5mr15197543lbc.32.1427397825099; Thu, 26 Mar 2015 12:23:45 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.57.201 with SMTP id k9csp813266lbq; Thu, 26 Mar 2015 12:23:44 -0700 (PDT) X-Received: by 10.68.168.225 with SMTP id zz1mr29002008pbb.3.1427397817916; Thu, 26 Mar 2015 12:23:37 -0700 (PDT) Received: from mail-pa0-f46.google.com (mail-pa0-f46.google.com. [209.85.220.46]) by mx.google.com with ESMTPS id wh6si9554265pac.221.2015.03.26.12.23.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Mar 2015 12:23:37 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.46 as permitted sender) client-ip=209.85.220.46; Received: by pacwe9 with SMTP id we9so71874309pac.1 for ; Thu, 26 Mar 2015 12:23:37 -0700 (PDT) X-Received: by 10.68.139.37 with SMTP id qv5mr26317836pbb.23.1427397817027; Thu, 26 Mar 2015 12:23:37 -0700 (PDT) Received: from localhost.localdomain (c-67-170-153-23.hsd1.or.comcast.net. [67.170.153.23]) by mx.google.com with ESMTPSA id pv4sm6365753pbb.17.2015.03.26.12.23.35 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Mar 2015 12:23:36 -0700 (PDT) From: John Stultz To: lkml Cc: Daniel Thompson , Russell King , Will Deacon , Catalin Marinas , Thomas Gleixner , Stephen Boyd , Peter Zijlstra , Ingo Molnar , John Stultz Subject: [PATCH 4/5] sched_clock: Remove redundant notrace from update function Date: Thu, 26 Mar 2015 12:23:25 -0700 Message-Id: <1427397806-20889-5-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427397806-20889-1-git-send-email-john.stultz@linaro.org> References: <1427397806-20889-1-git-send-email-john.stultz@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: john.stultz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Daniel Thompson Currently update_sched_clock() is marked as notrace but this function is not called by ftrace. This is trivially fixed by removing the mark up. Cc: Russell King Cc: Will Deacon Cc: Catalin Marinas Cc: Daniel Thompson Cc: Thomas Gleixner Cc: Stephen Boyd Cc: Peter Zijlstra Cc: Ingo Molnar Reviewed-by: Stephen Boyd Acked-by: Peter Zijlstra (Intel) Signed-off-by: Daniel Thompson Signed-off-by: John Stultz --- kernel/time/sched_clock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/time/sched_clock.c b/kernel/time/sched_clock.c index 52ea5d9..8adb9d0 100644 --- a/kernel/time/sched_clock.c +++ b/kernel/time/sched_clock.c @@ -111,7 +111,7 @@ unsigned long long notrace sched_clock(void) /* * Atomically update the sched_clock epoch. */ -static void notrace update_sched_clock(void) +static void update_sched_clock(void) { unsigned long flags; u64 cyc;