From patchwork Wed Oct 28 13:11:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 55683 Delivered-To: patch@linaro.org Received: by 10.112.61.134 with SMTP id p6csp112116lbr; Wed, 28 Oct 2015 06:12:53 -0700 (PDT) X-Received: by 10.66.153.166 with SMTP id vh6mr34707578pab.83.1446037973204; Wed, 28 Oct 2015 06:12:53 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id sa10si70354383pac.110.2015.10.28.06.12.52; Wed, 28 Oct 2015 06:12:53 -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; dkim=neutral (body hash did not verify) header.i=@linaro_org.20150623.gappssmtp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965776AbbJ1NMJ (ORCPT + 28 others); Wed, 28 Oct 2015 09:12:09 -0400 Received: from mail-wi0-f171.google.com ([209.85.212.171]:33391 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965721AbbJ1NMF (ORCPT ); Wed, 28 Oct 2015 09:12:05 -0400 Received: by wijp11 with SMTP id p11so254759007wij.0 for ; Wed, 28 Oct 2015 06:12:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro_org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VfMBhSEuj5dJPR24gw/7xb1+9vX1msnISmQdDBBQw7M=; b=JnpdprwSFT13vpPOWB8f0NT4811av8iA4IOfUwwACCOk2NI1G7N/oZLTgAXB91bIBc KuCmOtOOu86PRg68cTy7tJfHWR0AUmUSk3DGWRgOTCnv1VIbFAKOlG+NvZ6eTVwGBrxg e+eMJ4kCycQJAMn3hz2dDvdiJcWLaZfdHnng0Xc9TkRp3sHoGawOtf7zAfDnM5H3g1C3 JsrfgjmFTcqzWPopcfHyskFwzEA9JCc7n1tfwFqtPYBHxaKIRXr6RgUA3aSiHX2wC6Cd 3gg2UlPopCSA/u8mSM/q2MjV66QK+08YabDTE2FEwTm5rDh9w78HC0y0LzbFbjWpyJ+D w+fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VfMBhSEuj5dJPR24gw/7xb1+9vX1msnISmQdDBBQw7M=; b=k0BSnWpsex7gCs21qZfmbxfk2RMM3H87AIikFENQPSg9W+rP0H+r6WgukgMCuMKvQq g+PUt9y9Ibtqm9prXUWxIcACWXyEpaXmZMnBMkcybvd79BfUp/3GZGVCJFJ3pFmvKKms StIVeWwjVVFmSgByj6gA9Dyiz99z1b6DOlk1L6h+mtonv0v2riM6ul/XoBPeQ7p17ny3 +N0JfXbgiGlnAKSGBn9pl4jV4EOucC0ZP5yH3SDL3obURK+i1aLndrZDi4foxwIK36g4 xRTVatd0nPgiAaWib8popQYq8gYd/Zc3haGFHZBiYxbu8THBN0BNhzXw6jeHetzNIdLU tkzQ== X-Gm-Message-State: ALoCoQl1oH+XLcpnSXUodRkgit/YL9izIjh2+rGyyvplOZ7w3jDj0AHknCnjEkp+SNO/etQBZJoU X-Received: by 10.194.179.33 with SMTP id dd1mr37360410wjc.79.1446037924747; Wed, 28 Oct 2015 06:12:04 -0700 (PDT) Received: from localhost.localdomain (sju31-1-78-210-255-2.fbx.proxad.net. [78.210.255.2]) by smtp.gmail.com with ESMTPSA id lv4sm49967344wjb.43.2015.10.28.06.12.03 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Oct 2015 06:12:04 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de Cc: Jisheng Zhang , linux-kernel@vger.kernel.org (open list:CLOCKSOURCE, CLOC...) Subject: [PATCH 6/8] clocksource/drivers/fsl_ftm_timer: Prevent ftrace recursion Date: Wed, 28 Oct 2015 14:11:31 +0100 Message-Id: <1446037894-22601-6-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1446037894-22601-1-git-send-email-daniel.lezcano@linaro.org> References: <5630C947.4020706@linaro.org> <1446037894-22601-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jisheng Zhang Having a traceable function in the sched_clock() path leads to a recursion within ftrace and a kernel crash. We should not trace the ftm_read_sched_clock() function. Fix this by adding the notrace attribute to this function. Signed-off-by: Jisheng Zhang Signed-off-by: Daniel Lezcano --- drivers/clocksource/fsl_ftm_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff --git a/drivers/clocksource/fsl_ftm_timer.c b/drivers/clocksource/fsl_ftm_timer.c index ef43469..10202f1 100644 --- a/drivers/clocksource/fsl_ftm_timer.c +++ b/drivers/clocksource/fsl_ftm_timer.c @@ -118,7 +118,7 @@ static inline void ftm_reset_counter(void __iomem *base) ftm_writel(0x00, base + FTM_CNT); } -static u64 ftm_read_sched_clock(void) +static u64 notrace ftm_read_sched_clock(void) { return ftm_readl(priv->clksrc_base + FTM_CNT); }