From patchwork Tue Sep 11 16:19:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cyril Chemparathy X-Patchwork-Id: 1438951 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 7D8FA3FC33 for ; Tue, 11 Sep 2012 16:24:36 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TBTBJ-0000f1-0C; Tue, 11 Sep 2012 16:19:21 +0000 Received: from comal.ext.ti.com ([198.47.26.152]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TBTBF-0000eM-5I for linux-arm-kernel@lists.infradead.org; Tue, 11 Sep 2012 16:19:17 +0000 Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id q8BGJ2br029514; Tue, 11 Sep 2012 11:19:02 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id q8BGJ20l027959; Tue, 11 Sep 2012 11:19:02 -0500 Received: from dlelxv22.itg.ti.com (172.17.1.197) by dfle72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.1.323.3; Tue, 11 Sep 2012 11:19:02 -0500 Received: from ares-ubuntu.am.dhcp.ti.com (ares-ubuntu.am.dhcp.ti.com [158.218.103.17]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id q8BGJ2xX029534; Tue, 11 Sep 2012 11:19:02 -0500 Received: from a0875269 by ares-ubuntu.am.dhcp.ti.com with local (Exim 4.76) (envelope-from ) id 1TBTAz-0007KW-To; Tue, 11 Sep 2012 12:19:01 -0400 From: Cyril Chemparathy To: Subject: [PATCH] ARM: avoid undef on ARCH_HAS_READ_CURRENT_TIMER Date: Tue, 11 Sep 2012 12:19:00 -0400 Message-ID: <1347380341-28145-1-git-send-email-cyril@ti.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -7.3 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [198.47.26.152 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.3 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: thomas.petazzoni@free-electrons.com, linux@arm.linux.org.uk, arnd@arndb.de, nico@linaro.org, will.deacon@arm.com, sboyd@codeaurora.org, rob.herring@calxeda.com, Cyril Chemparathy , shinya.kuribayashi.px@renesas.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org With the inclusion of asm-generic/timex.h, the ARM arch timer implementation breaks on build. This is because asm/arch_timer.h now defines ARCH_HAS_READ_CURRENT_TIMER, only to have this macro undefined by the subsequent inclusion of asm-generic/timex.h. This patch fixes the problem in asm/timex.h by including asm-generic/timex.h early, and by defining get_cycles even earlier. This patch has been tested against linux-next-20120910, both with and without arch timer support. Signed-off-by: Cyril Chemparathy --- arch/arm/include/asm/arch_timer.h | 1 + arch/arm/include/asm/timex.h | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h index 62e7547..6beb06a 100644 --- a/arch/arm/include/asm/arch_timer.h +++ b/arch/arm/include/asm/arch_timer.h @@ -7,6 +7,7 @@ #define ARCH_HAS_READ_CURRENT_TIMER int arch_timer_of_register(void); int arch_timer_sched_clock_init(void); +int read_current_timer(cycles_t *c); #else static inline int arch_timer_of_register(void) { diff --git a/arch/arm/include/asm/timex.h b/arch/arm/include/asm/timex.h index 5e71172..76f4217 100644 --- a/arch/arm/include/asm/timex.h +++ b/arch/arm/include/asm/timex.h @@ -12,13 +12,21 @@ #ifndef _ASMARM_TIMEX_H #define _ASMARM_TIMEX_H +#define get_cycles get_cycles + +#include #include #include +static inline cycles_t get_cycles(void) +{ #ifdef ARCH_HAS_READ_CURRENT_TIMER -#define get_cycles() ({ cycles_t c; read_current_timer(&c) ? 0 : c; }) -#endif + cycles_t c; -#include + if (!read_current_timer(&c)) + return c; +#endif + return 0; +} #endif