From patchwork Wed May 17 16:10:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 100005 Delivered-To: patch@linaro.org Received: by 10.182.142.97 with SMTP id rv1csp288056obb; Wed, 17 May 2017 09:11:28 -0700 (PDT) X-Received: by 10.84.231.206 with SMTP id g14mr5160558pln.12.1495037488542; Wed, 17 May 2017 09:11:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495037488; cv=none; d=google.com; s=arc-20160816; b=wFgKHW3KGNwWslLc/tZu42oS0nJJfb80Vt7w/pCDuZ0Dw2FaDSbsc+Hoc4BzxIrth0 OtMHrFLjflUDzBOZZjg3io4PZfVHo36Nqa1z0SLWds92r5yyR0ZCwSxovs5O/uJUWT0E Gdn1QPjGrdEkQqk8KTMqm2ckour/+gSLS1FfyZ3y1/Ca13f54tnHuXha335Z+SVObNEy fBYkjWPt8P8Uh4JZ4AhzOBdpmeTM6YqE4i0mIL8v6e3Kg/q8C/7i6wgL8i067Ravz6VR hhQVR6ddXWnmKSkMEWSp1Tljyc6uX36cb68Wamcv4dTxHUFHjdiI4yaFAl2lWNkZmURJ FuZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=Th9pjXHd3Ablh7fSzn4UXKGPhBWYNyFpP1bm1zmGGsQ=; b=Yl1XfEbN/W6ie+2ok0T6DAcCJqPgu7k9EKRDjH5bw8W3pPp060+/gyooFzLrd6o7v2 3wRcnJc/CZtVDBWmg4TQa6dJawnRmP1KlkXnjMtuLljzswvtxQwpKQezpkXKWhx11AVy yOYUMT5aNgmC7iTaUXKS3uB1GrJccjYUvC0PksQ3PAeuSEa3S9xFR6/2aoDZK0bEn4Rp N7I8RaDubXxuX8rap6phtbc8Lk2nOowcXQjn04/HUV5fCj5UbQLP71OEhPo6JvFuP0hl 7IZ9V/nfhf0hrJ5xe4KC6bTV4K1XrBl2M1AdvTzRWDxf0h33TJpQcTBXCDTPs7XZDAI5 dCpQ== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e63si2472856pfa.113.2017.05.17.09.11.28; Wed, 17 May 2017 09:11:28 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753322AbdEQQL0 (ORCPT + 25 others); Wed, 17 May 2017 12:11:26 -0400 Received: from foss.arm.com ([217.140.101.70]:49782 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753158AbdEQQLV (ORCPT ); Wed, 17 May 2017 12:11:21 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id DF7561435; Wed, 17 May 2017 09:11:18 -0700 (PDT) Received: from leverpostej.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id EF6D63F3E1; Wed, 17 May 2017 09:11:17 -0700 (PDT) From: Mark Rutland To: linux-kernel@vger.kernel.org, daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-arm-kernel@lists.infradead.org, Mark Rutland Subject: [PATCH] clocksource: arm_arch_timer: fix DEFINE_PER_CPU expansion Date: Wed, 17 May 2017 17:10:41 +0100 Message-Id: <1495037441-11211-1-git-send-email-mark.rutland@arm.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Our ctags mangling script can't handle newlines inside of a DEFINE_PER_CPU(), leading to an annoying message whenever tags are built: ctags: Warning: drivers/clocksource/arm_arch_timer.c:302: null expansion of name pattern "\1" This was dealt with elsewhere in commit: 25528213fe9f75f4 ("tags: Fix DEFINE_PER_CPU expansions") ... by ensuring each DEFINE_PER_CPU() was contained on a single line, even where this would violate the usual code style (checkpatch warnings and all). Let's do the same for the arch timer driver, and get rid of the distraction. Fixes: 6acc71ccac7187fc ("arm64: arch_timer: Allows a CPU-specific erratum to only affect a subset of CPUs") Signed-off-by: Mark Rutland Cc: Daniel Lezcano Cc: Thomas Gleixner Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- drivers/clocksource/arm_arch_timer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Daniel/Thomas, this fixes a small bit of fallout from the recent merge window. Would it be possible to pick it up as a fix for v4.12? Thanks, Mark. -- 1.9.1 diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 4bed671..21669ec 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -299,8 +299,7 @@ static u64 notrace arm64_858921_read_cntvct_el0(void) #endif #ifdef CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND -DEFINE_PER_CPU(const struct arch_timer_erratum_workaround *, - timer_unstable_counter_workaround); +DEFINE_PER_CPU(const struct arch_timer_erratum_workaround *, timer_unstable_counter_workaround); EXPORT_SYMBOL_GPL(timer_unstable_counter_workaround); DEFINE_STATIC_KEY_FALSE(arch_timer_read_ool_enabled);