From patchwork Wed Oct 28 13:11:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 55685 Delivered-To: patch@linaro.org Received: by 10.112.61.134 with SMTP id p6csp112684lbr; Wed, 28 Oct 2015 06:13:48 -0700 (PDT) X-Received: by 10.68.69.45 with SMTP id b13mr53572315pbu.67.1446038028759; Wed, 28 Oct 2015 06:13:48 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gx4si70312323pbc.234.2015.10.28.06.13.48; Wed, 28 Oct 2015 06:13: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; 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 S965866AbbJ1NNq (ORCPT + 28 others); Wed, 28 Oct 2015 09:13:46 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:35271 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965702AbbJ1NMG (ORCPT ); Wed, 28 Oct 2015 09:12:06 -0400 Received: by wicll6 with SMTP id ll6so197912640wic.0 for ; Wed, 28 Oct 2015 06:12:05 -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=ChylT/Orkg6niCyrVv0EKWvcjygXZWEQmqw784szf3c=; b=bIRQtcQSDq3nvE+mfN8vWMQzYoH8moE/PX1748wieT2PaFdy58c+s7RSW+x4iMUDox E0x2IWvNTSf3lyqlXfYm0gvghzWrxwnq2E26lNG+8VBZXwIeKtiY1HcOKQd51f7RKy5Z P1E7Yn/aW9R0IvE67Y27o61JVvtYACqg/XD/UxEekqtYbzcNiTrUcJOM/piuA1ob/vgL Xlzbu8b9V77mN9vdq1x1Q7wDZqtdpupQsblcwMoP6YLgGghnrTX8VemCWCzAwBU7/3+Q cjeq+zzEnVMGA7JShmg65/+DSiXgfhDxVkXuga0OSn8bDPh6B5NxJJxXRdpWMdkGLmbn HzXQ== 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=ChylT/Orkg6niCyrVv0EKWvcjygXZWEQmqw784szf3c=; b=NzVuOHBaJyg9FJ989SnfgBHLRekUDq4X29qe8Iy4KXVy8y2ZDLO4tYqRiukyRwOrF1 b7F89AbaRwI80oMKDKyGjDxdCNuOPN+uGr+5LNdboET5lqFIkue3E9iGhLe+srC4p/ts NDrsli6Y0GcwQfv+IbtrL2oz5dpNpyOfiiq9cfhsuQUbxv8D1KHO9+zGLINJTQ4NKrZp e3qWLAqlXeGf4cd6ENTWdaCzcjlBS4xdpZqxi1Fwp1+n0S9XYQrCb2DsTzoxpsYHEPqA 31jLHAANE+Gl7nTaDaMP3KMIgLRq7/6yuRwbXZ9kMn/saBF7YV6vG8bnClUx1k/Jfxif NwAg== X-Gm-Message-State: ALoCoQl5qWUzznhcho5rJiXXwNT7PAppDimnGTPVDJgyoYEoW+6jUXX7HsQSqzwmpA75w3ddQZ72 X-Received: by 10.181.13.101 with SMTP id ex5mr2790512wid.2.1446037925877; Wed, 28 Oct 2015 06:12:05 -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.04 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Oct 2015 06:12:05 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de Cc: Jisheng Zhang , Baruch Siach , linux-kernel@vger.kernel.org (open list:CLOCKSOURCE, CLOC...), linux-arm-kernel@lists.infradead.org (moderated list:ARM/CONEXANT DIGI...) Subject: [PATCH 7/8] clocksource/drivers/digicolor: Prevent ftrace recursion Date: Wed, 28 Oct 2015 14:11:32 +0100 Message-Id: <1446037894-22601-7-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 digicolor_timer_sched_read() function. Fix this by adding the notrace attribute to this function. Signed-off-by: Jisheng Zhang Acked-by: Baruch Siach Signed-off-by: Daniel Lezcano --- drivers/clocksource/timer-digicolor.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/timer-digicolor.c b/drivers/clocksource/timer-digicolor.c index e73947f0f..a536eeb 100644 --- a/drivers/clocksource/timer-digicolor.c +++ b/drivers/clocksource/timer-digicolor.c @@ -143,7 +143,7 @@ static irqreturn_t digicolor_timer_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -static u64 digicolor_timer_sched_read(void) +static u64 notrace digicolor_timer_sched_read(void) { return ~readl(dc_timer_dev.base + COUNT(TIMER_B)); }