From patchwork Tue Mar 17 17:38: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: 45893 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8C65D2153C for ; Tue, 17 Mar 2015 17:38:51 +0000 (UTC) Received: by wggy19 with SMTP id y19sf3064362wgg.2 for ; Tue, 17 Mar 2015 10:38:50 -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=GfGq/Xjsb3A3fSDwXuItz4Q65njIon6+yx9NJ/rhF7o=; b=NzsE50+4ZaFhrmcbfHUEIiC3eJOSQovaJct/yESX7ReEo76Fsi4yCOPMy3PbAVartF mfUTgO/DgFOVN5RzRFiv3HcBAOM/FZONSqdlVFLAGuph4Yvhk7TcAB7BZfsyHHcEH15M Bdj9z87/FyR4DRWRyFCCF3D20YkhjaK7V/TLvM3nu8uez/keiplwfO/2NQOb6zwZhTVd TZCz/US8a7s+jN2IUNKhOsH1/21Md4RKSux8KV3AD3B+DAgkKzqMUGze+zu4eT9ffXRN T4P3n7+trjpBLUFfEfu0z/Jn5Cj6S9h81qwZck6aQ9LLCZiPuWnXW7CRu0Bv5ABzh7t1 M78A== X-Gm-Message-State: ALoCoQmGdLloMebp19vmUQouHIyLX7wmndiqnL1Fp04TrigyM9PFJojfWUmeocD7P3UUE3q7Nz1o X-Received: by 10.180.101.101 with SMTP id ff5mr13493138wib.5.1426613930900; Tue, 17 Mar 2015 10:38:50 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.43.10 with SMTP id s10ls75284lal.81.gmail; Tue, 17 Mar 2015 10:38:50 -0700 (PDT) X-Received: by 10.152.18.225 with SMTP id z1mr61819489lad.124.1426613930647; Tue, 17 Mar 2015 10:38:50 -0700 (PDT) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com. [209.85.217.181]) by mx.google.com with ESMTPS id p3si11054741lbm.74.2015.03.17.10.38.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Mar 2015 10:38:50 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by lbbzq9 with SMTP id zq9so12574085lbb.0 for ; Tue, 17 Mar 2015 10:38:50 -0700 (PDT) X-Received: by 10.112.212.106 with SMTP id nj10mr42045183lbc.36.1426613930535; Tue, 17 Mar 2015 10:38:50 -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.35.133 with SMTP id h5csp660993lbj; Tue, 17 Mar 2015 10:38:49 -0700 (PDT) X-Received: by 10.70.92.68 with SMTP id ck4mr151706136pdb.3.1426613919844; Tue, 17 Mar 2015 10:38:39 -0700 (PDT) Received: from mail-pa0-f54.google.com (mail-pa0-f54.google.com. [209.85.220.54]) by mx.google.com with ESMTPS id g12si30620984pat.3.2015.03.17.10.38.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Mar 2015 10:38:39 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.54 as permitted sender) client-ip=209.85.220.54; Received: by pabyw6 with SMTP id yw6so15740187pab.2 for ; Tue, 17 Mar 2015 10:38:39 -0700 (PDT) X-Received: by 10.66.148.165 with SMTP id tt5mr144204839pab.38.1426613918960; Tue, 17 Mar 2015 10:38:38 -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 hk6sm23410539pdb.83.2015.03.17.10.38.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Mar 2015 10:38:38 -0700 (PDT) From: John Stultz To: lkml Cc: Daniel Thompson , Russell King , Will Deacon , Catalin Marinas , Thomas Gleixner , Stephen Boyd , Ingo Molnar , Peter Zijlstra , John Stultz Subject: [PATCH 4/5] sched_clock: Remove redundant notrace from update function Date: Tue, 17 Mar 2015 10:38:25 -0700 Message-Id: <1426613906-19718-5-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1426613906-19718-1-git-send-email-john.stultz@linaro.org> References: <1426613906-19718-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.217.181 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: Thomas Gleixner Cc: Stephen Boyd Cc: Ingo Molnar Cc: Peter Zijlstra Signed-off-by: Daniel Thompson Reviewed-by: Stephen Boyd 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 5d64079..9280327 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;