From patchwork Wed Oct 28 13:11:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 55682 Delivered-To: patch@linaro.org Received: by 10.112.61.134 with SMTP id p6csp111739lbr; Wed, 28 Oct 2015 06:12:16 -0700 (PDT) X-Received: by 10.68.57.208 with SMTP id k16mr54665625pbq.12.1446037936535; Wed, 28 Oct 2015 06:12:16 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q1si70297323par.200.2015.10.28.06.12.16; Wed, 28 Oct 2015 06:12:16 -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 S965816AbbJ1NML (ORCPT + 28 others); Wed, 28 Oct 2015 09:12:11 -0400 Received: from mail-wi0-f171.google.com ([209.85.212.171]:33374 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965683AbbJ1NME (ORCPT ); Wed, 28 Oct 2015 09:12:04 -0400 Received: by wijp11 with SMTP id p11so254758436wij.0 for ; Wed, 28 Oct 2015 06:12:03 -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=bM8kexkCKgGZeuW74ZF8/IHL/0WAxbRKN7gXhhNFSr8=; b=M6mt4CIHJqTvxQ8q598r2auP1gTzVfALVFeYQKdD9RggYCr6ULtDK2vn7bGHyZeXok EGGJXbRn0pf9vb1Ul3m/oNovfVXqwMvGrbezZdBtz/u0QPu1yBNCC7lOYIDo+MOrFhUz fkT36cFyNMdEOInjpX69sjbU81FoO4GEEcA8PV/6c6khaIpnsTRyXpJtZQ8msW5Ln30Y SyjwlXZU9rNsju/lrxIhJjhv4BUSfE1UIUw40+dbUBFkjio9r33+kjF7UkGA4YZq3xNa rKPJLz8FiTn2XaTyIC79jpX1HbOds2e3v1NJdn+zQ8R6EwQpR36qysaFk4PJ2NDa6xMs V3Uw== 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=bM8kexkCKgGZeuW74ZF8/IHL/0WAxbRKN7gXhhNFSr8=; b=mpu59PpZnJiUIlruaxd8MEXwa/cTuHyO0MsDrDImuWF741U+ZuUoI04d3PMsZY1ZmK fpjlqboX3ORy/KqYxdex2rP9piDYmUKjsI6euctlLMnThV0/eBfmNHfwB1phXiJSlAhU w05gR8e0LYhXE7/B4JIO1pJlk3dVU+aLcFBYxKeyRqvpmmhyWc3uROAzAvm0Myf10bbC Y2OIUFYjm/FlZ1gXyFbZE93yQifYhhnpV+jrBhYqRkNv3FfhMtn/8h8R+G+68LbGZiau 9voKOGiROuMRR/CDMDJXK2XbKKNfF4W1+lxXM1U9uMTiMH1Kt20oH8SsCgAaNlNRTXOD YrBw== X-Gm-Message-State: ALoCoQkoNdnCgkNydCwTvRNQni4DrQWZIzi+mtre3+79FWnE+K7xz4+v5frpDVp7ngySJXnZIIUp X-Received: by 10.180.36.15 with SMTP id m15mr2585485wij.90.1446037923776; Wed, 28 Oct 2015 06:12:03 -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.02 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Oct 2015 06:12:03 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de Cc: Jisheng Zhang , linux-kernel@vger.kernel.org (open list:CLOCKSOURCE, CLOC...) Subject: [PATCH 5/8] clocksource/drivers/vf_pit_timer: Prevent ftrace recursion Date: Wed, 28 Oct 2015 14:11:30 +0100 Message-Id: <1446037894-22601-5-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 pit_read_sched_clock() function. Fix this by adding a notrace attribute to this function. Signed-off-by: Jisheng Zhang Signed-off-by: Daniel Lezcano --- drivers/clocksource/vf_pit_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/vf_pit_timer.c b/drivers/clocksource/vf_pit_timer.c index f07ba99..a0e6c68 100644 --- a/drivers/clocksource/vf_pit_timer.c +++ b/drivers/clocksource/vf_pit_timer.c @@ -52,7 +52,7 @@ static inline void pit_irq_acknowledge(void) __raw_writel(PITTFLG_TIF, clkevt_base + PITTFLG); } -static u64 pit_read_sched_clock(void) +static u64 notrace pit_read_sched_clock(void) { return ~__raw_readl(clksrc_base + PITCVAL); }